michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: use DEVICE_INIT everwhere

Browse source 
This is the last step before obsoleting DEVICE_DEFINE() and
DEVICE_INIT_CONFIG_DEFINE().

Change-Id: Ica4257662969048083ab9839872b4b437b8b351b
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-01-28 14:48:47 -05:00 • committed by Anas Nashif
commit d340d4cb3f
57 changed files with 270 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/soc/atmel_sam3/soc.c
View file

@ -194,5 +194,6 @@ static int atmel_sam3_init(struct device *arg)
return 0;
}
DEVICE_INIT_CONFIG_DEFINE(atmel_sam3_0, "", atmel_sam3_init, NULL);
DEVICE_DEFINE(atmel_sam3_0, NULL, PRIMARY, 0);
DEVICE_INIT(atmel_sam3_0, "", atmel_sam3_init,
NULL, NULL,
PRIMARY, 0);

5
arch/arm/soc/fsl_frdm_k64f/soc.c
View file

@ -320,5 +320,6 @@ static int fsl_frdm_k64f_init(struct device *arg)
return 0;
}
DEVICE_INIT_CONFIG_DEFINE(fsl_frdm_0, "", fsl_frdm_k64f_init, NULL);
DEVICE_DEFINE(fsl_frdm_0, NULL, PRIMARY, 0);
DEVICE_INIT(fsl_frdm_0, "", fsl_frdm_k64f_init,
NULL, NULL,
PRIMARY, 0);

12
arch/arm/soc/fsl_frdm_k64f/soc_config.c
View file

@ -71,9 +71,9 @@ static int uart_k20_console_init(struct device *dev)
return DEV_OK;
}
DEVICE_INIT_CONFIG_DEFINE(_uart_k20_console, "", uart_k20_console_init, NULL);
DEVICE_DEFINE(_uart_k20_console, NULL, PRIMARY,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
DEVICE_INIT(_uart_k20_console, "", uart_k20_console_init,
NULL, NULL,
PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#endif
#endif /* CONFIG_UART_CONSOLE */
@ -117,8 +117,8 @@ static int uart_k20_init(struct device *dev)
return DEV_OK;
}
DEVICE_INIT_CONFIG_DEFINE(_uart_k20_init, "", uart_k20_init, NULL);
DEVICE_DEFINE(_uart_k20_init, NULL, PRIMARY,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
DEVICE_INIT(_uart_k20_init, "", uart_k20_init,
NULL, NULL,
PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#endif /* CONFIG_UART_K20 */

6
arch/arm/soc/ti_lm3s6965/soc.c
View file

@ -56,6 +56,6 @@ static int ti_lm3s6965_init(struct device *arg)
return 0;
}
DEVICE_INIT_CONFIG_DEFINE(ti_lm3_0, "", ti_lm3s6965_init, NULL);
DEVICE_DEFINE(ti_lm3_0, NULL, PRIMARY,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
DEVICE_INIT(ti_lm3_0, "", ti_lm3s6965_init,
NULL, NULL,
PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

6
arch/arm/soc/ti_lm3s6965/soc_config.c
View file

@ -51,8 +51,8 @@ static int uart_stellaris_init(struct device *dev)
return DEV_OK;
}
DEVICE_INIT_CONFIG_DEFINE(_uart_stellaris_en, "", uart_stellaris_init, NULL);
DEVICE_DEFINE(_uart_stellaris_en, NULL, PRIMARY,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
DEVICE_INIT(_uart_stellaris_en, "", uart_stellaris_init,
NULL, NULL,
PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
#endif /* CONFIG_UART_STELLARIS */