device: rename DECLARE_DEVICE_INIT_CONFIG()

Rename it to DEVICE_INIT_CONFIG_DEFINE(), because (a) it was not fitting
in any namespace and (b) it is not used to declare, but rather define a
object.

Change-Id: I1da5822f06b85a9fb024b5b184afd0ccc01012ec
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>

arch/arc/soc/quark_se_ss/soc.c

@@ -48,6 +48,6 @@ static int quark_se_arc_init(struct device *arg)
 	shared_data->flags |= ARC_READY;
 	return 0;
 }
-DECLARE_DEVICE_INIT_CONFIG(quark_se_arc_0, "", quark_se_arc_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(quark_se_arc_0, "", quark_se_arc_init, NULL);
 SYS_DEFINE_DEVICE(quark_se_arc_0, NULL, PRIMARY,
 					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

arch/arc/soc/quark_se_ss/soc_config.c

@@ -33,7 +33,7 @@ static int arc_quark_se_ipm_init(void)
 static struct quark_se_ipm_controller_config_info ipm_controller_config = {
 	.controller_init = arc_quark_se_ipm_init
 };
-DECLARE_DEVICE_INIT_CONFIG(quark_se_ipm, "", quark_se_ipm_controller_initialize,
+DEVICE_INIT_CONFIG_DEFINE(quark_se_ipm, "", quark_se_ipm_controller_initialize,
 			   &ipm_controller_config);
 SYS_DEFINE_DEVICE(quark_se_ipm, NULL, SECONDARY,
 					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
@@ -46,7 +46,7 @@ struct ipm_console_sender_config_info quark_se_ipm_sender_config = {
 	.bind_to = "quark_se_ipm4",
 	.flags = IPM_CONSOLE_PRINTK | IPM_CONSOLE_STDOUT,
 };
-DECLARE_DEVICE_INIT_CONFIG(ipm_console, "ipm_console",
+DEVICE_INIT_CONFIG_DEFINE(ipm_console, "ipm_console",
 			   ipm_console_sender_init,
 			   &quark_se_ipm_sender_config);
 SYS_DEFINE_DEVICE(ipm_console, NULL, SECONDARY, CONFIG_IPM_CONSOLE_PRIORITY);
@@ -73,7 +73,7 @@ static int uart_ns16550_init(struct device *dev)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(uart_ns16550_init, "", uart_ns16550_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_init, "", uart_ns16550_init, NULL);
 SYS_DEFINE_DEVICE(uart_ns16550_init, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 

arch/arm/soc/atmel_sam3/soc.c

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

arch/arm/soc/fsl_frdm_k64f/soc.c

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

arch/arm/soc/fsl_frdm_k64f/soc_config.c

@@ -71,7 +71,7 @@ static int uart_k20_console_init(struct device *dev)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(_uart_k20_console, "", uart_k20_console_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(_uart_k20_console, "", uart_k20_console_init, NULL);
 SYS_DEFINE_DEVICE(_uart_k20_console, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
@@ -117,7 +117,7 @@ static int uart_k20_init(struct device *dev)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(_uart_k20_init, "", uart_k20_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(_uart_k20_init, "", uart_k20_init, NULL);
 SYS_DEFINE_DEVICE(_uart_k20_init, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 

arch/arm/soc/ti_lm3s6965/soc.c

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

arch/arm/soc/ti_lm3s6965/soc_config.c

@@ -51,7 +51,7 @@ static int uart_stellaris_init(struct device *dev)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(_uart_stellaris_en, "", uart_stellaris_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(_uart_stellaris_en, "", uart_stellaris_init, NULL);
 SYS_DEFINE_DEVICE(_uart_stellaris_en, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 

arch/x86/core/cache.c

@@ -107,7 +107,7 @@ static int init_cache(struct device *unused)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(cache, "", init_cache, NULL);
+DEVICE_INIT_CONFIG_DEFINE(cache, "", init_cache, NULL);
 SYS_DEFINE_DEVICE(cache, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif /* CONFIG_CLFLUSH_DETECT || CONFIG_CACHE_LINE_SIZE_DETECT */

arch/x86/soc/quark_d2000/soc.c

@@ -62,11 +62,11 @@ static int quark_d2000_init(struct device *arg)
 
 	return 0;
 }
-DECLARE_DEVICE_INIT_CONFIG(quark_d2000_0, "", quark_d2000_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(quark_d2000_0, "", quark_d2000_init, NULL);
 SYS_DEFINE_DEVICE(quark_d2000_0, NULL, PRIMARY,
 					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #ifdef CONFIG_MVIC
-DECLARE_DEVICE_INIT_CONFIG(mvic_0, "", _mvic_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(mvic_0, "", _mvic_init, NULL);
 SYS_DEFINE_DEVICE(mvic_0, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 #endif /* CONFIG_IOAPIC */

arch/x86/soc/quark_se/soc.c

@@ -86,7 +86,7 @@ static int arc_init(struct device *arg)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(quark_se_ss_0, "", arc_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(quark_se_ss_0, "", arc_init, NULL);
 SYS_DEFINE_DEVICE(quark_se_ss_0, NULL, SECONDARY,
 					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
@@ -110,7 +110,7 @@ static int platform_uart_init(struct device *arg)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(platform_uart_init, "", platform_uart_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(platform_uart_init, "", platform_uart_init, NULL);
 SYS_DEFINE_DEVICE(platform_uart_init, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 

arch/x86/soc/quark_se/soc_config.c

@@ -38,7 +38,7 @@ static int x86_quark_se_ipm_init(void)
 static struct quark_se_ipm_controller_config_info ipm_controller_config = {
 	.controller_init = x86_quark_se_ipm_init
 };
-DECLARE_DEVICE_INIT_CONFIG(quark_se_ipm, "", quark_se_ipm_controller_initialize,
+DEVICE_INIT_CONFIG_DEFINE(quark_se_ipm, "", quark_se_ipm_controller_initialize,
 			   &ipm_controller_config);
 SYS_DEFINE_DEVICE(quark_se_ipm, NULL, PRIMARY,
 					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
@@ -64,7 +64,7 @@ struct ipm_console_receiver_config_info quark_se_ipm_receiver_config = {
 	.flags = IPM_CONSOLE_PRINTK
 };
 struct ipm_console_receiver_runtime_data quark_se_ipm_receiver_driver_data;
-DECLARE_DEVICE_INIT_CONFIG(ipm_console0, "ipm_console0",
+DEVICE_INIT_CONFIG_DEFINE(ipm_console0, "ipm_console0",
 			   ipm_console_receiver_init,
 			   &quark_se_ipm_receiver_config);
 SYS_DEFINE_DEVICE(ipm_console0, &quark_se_ipm_receiver_driver_data,

arch/x86/soc/quark_x1000/soc.c

@@ -67,7 +67,7 @@ static int pci_legacy_bridge_irq_config(struct device *unused)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(pci_legacy_bridge_0, "", pci_legacy_bridge_irq_config, NULL);
+DEVICE_INIT_CONFIG_DEFINE(pci_legacy_bridge_0, "", pci_legacy_bridge_irq_config, NULL);
 SYS_DEFINE_DEVICE(pci_legacy_bridge_0, NULL, SECONDARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 #endif /* CONFIG_PCI_LEGACY_BRIDGE */

boards/arduino_101/pinmux.c

@@ -362,7 +362,7 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pmux,			/* config name */
+DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
 			   PINMUX_NAME,			/* driver name */
 			   &pinmux_initialize,		/* init function */
 			   &board_pmux);		/* config options*/

boards/galileo/galileo_pinmux.c

@@ -765,7 +765,7 @@ struct pinmux_config galileo_pmux = {
 	.base_address = 0x00000000,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pmux,
+DEVICE_INIT_CONFIG_DEFINE(pmux,
 			  PINMUX_NAME,
 			  &pinmux_galileo_initialize,
 			  &galileo_pmux);

boards/quark_d2000_crb/pinmux.c

@@ -288,7 +288,7 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pmux,			/* config name */
+DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
 			   PINMUX_NAME,			/* driver name */
 			   &pinmux_initialize,		/* init function */
 			   &board_pmux);		/* config options*/

boards/quark_se_ctb/pinmux.c

@@ -345,7 +345,7 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pmux,			/* config name */
+DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
 			   PINMUX_NAME,			/* driver name */
 			   &pinmux_initialize,		/* init function */
 			   &board_pmux);		/* config options*/

boards/quark_se_devboard/pinmux.c

@@ -347,7 +347,7 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pmux,			/* config name */
+DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
 			   PINMUX_NAME,			/* driver name */
 			   &pinmux_initialize,		/* init function */
 			   &board_pmux);		/* config options*/

drivers/adc/adc_dw.c

@@ -529,7 +529,7 @@ struct adc_config adc_config_dev_0 = {
 		.config_func  = adc_config_0_irq,
 	};
 
-DECLARE_DEVICE_INIT_CONFIG(adc_dw_0,	/* config name*/
+DEVICE_INIT_CONFIG_DEFINE(adc_dw_0,	/* config name*/
 			CONFIG_ADC_DW_NAME_0,	/* driver name*/
 			&adc_dw_init,	/* init function*/
 			&adc_config_dev_0); /* config options*/

drivers/adc/adc_ti_adc108s102.c

@@ -243,7 +243,7 @@ struct ti_adc108s102_config adc108s102_0_config = {
 	.spi_slave = CONFIG_ADC_TI_ADC108S102_0_SPI_SLAVE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(adc108s102_0, CONFIG_ADC_TI_ADC108S102_0_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(adc108s102_0, CONFIG_ADC_TI_ADC108S102_0_DRV_NAME,
 			   ti_adc108s102_init, &adc108s102_0_config);
 
 SYS_DEFINE_DEVICE(adc108s102_0, &adc108s102_0_data, SECONDARY,

drivers/aio/aio_dw_comparator.c

@@ -201,7 +201,7 @@ struct dw_aio_cmp_dev_cfg_t dw_aio_cmp_dev_config = {
 	.config_func = dw_aio_cmp_config,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(dw_aio_cmp,
+DEVICE_INIT_CONFIG_DEFINE(dw_aio_cmp,
 			   AIO_DW_CMP_DRV_NAME,
 			   &dw_aio_cmp_init,
 			   &dw_aio_cmp_dev_config);

drivers/bluetooth/h4.c

@@ -259,6 +259,6 @@ static int _bt_uart_init(struct device *unused)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(bt_uart, "", _bt_uart_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(bt_uart, "", _bt_uart_init, NULL);
 SYS_DEFINE_DEVICE(bt_uart, NULL, NANOKERNEL,
 					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);

drivers/bluetooth/h5.c

@@ -790,6 +790,6 @@ static int _bt_uart_init(struct device *unused)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(bt_uart, "", _bt_uart_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(bt_uart, "", _bt_uart_init, NULL);
 SYS_DEFINE_DEVICE(bt_uart, NULL, NANOKERNEL,
 					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);

drivers/clock_control/quark_se_clock_control.c

@@ -101,7 +101,7 @@ struct quark_se_clock_control_config clock_quark_se_peripheral_config = {
 	.base_address = CLOCK_PERIPHERAL_BASE_ADDR
 };
 
-DECLARE_DEVICE_INIT_CONFIG(clock_quark_se_peripheral,
+DEVICE_INIT_CONFIG_DEFINE(clock_quark_se_peripheral,
 			   CONFIG_CLOCK_CONTROL_QUARK_SE_PERIPHERAL_DRV_NAME,
 			   &quark_se_clock_control_init,
 			   &clock_quark_se_peripheral_config);
@@ -116,7 +116,7 @@ struct quark_se_clock_control_config clock_quark_se_external_config = {
 	.base_address = CLOCK_EXTERNAL_BASE_ADDR
 };
 
-DECLARE_DEVICE_INIT_CONFIG(clock_quark_se_external,
+DEVICE_INIT_CONFIG_DEFINE(clock_quark_se_external,
 			   CONFIG_CLOCK_CONTROL_QUARK_SE_EXTERNAL_DRV_NAME,
 			   &quark_se_clock_control_init,
 			   &clock_quark_se_external_config);
@@ -131,7 +131,7 @@ struct quark_se_clock_control_config clock_quark_se_sensor_config = {
 	.base_address = CLOCK_SENSOR_BASE_ADDR
 };
 
-DECLARE_DEVICE_INIT_CONFIG(clock_quark_se_sensor,
+DEVICE_INIT_CONFIG_DEFINE(clock_quark_se_sensor,
 			   CONFIG_CLOCK_CONTROL_QUARK_SE_SENSOR_DRV_NAME,
 			   &quark_se_clock_control_init,
 			   &clock_quark_se_sensor_config);

drivers/console/ram_console.c

@@ -45,6 +45,6 @@ static int ram_console_init(struct device *d)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(ram_console, "", ram_console_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(ram_console, "", ram_console_init, NULL);
 SYS_DEFINE_DEVICE(ram_console, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 

drivers/console/uart_console.c

@@ -429,7 +429,7 @@ static int uart_console_init(struct device *arg)
 
 	return DEV_OK;
 }
-DECLARE_DEVICE_INIT_CONFIG(uart_console, "", uart_console_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(uart_console, "", uart_console_init, NULL);
 
 /* UART consloe initializes after the UART device itself */
 #if defined(CONFIG_EARLY_CONSOLE)

drivers/ethernet/eth_dw.c

@@ -303,7 +303,7 @@ static struct eth_config eth_config_0 = {
 
 static struct eth_runtime eth_0_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(eth_dw_0, CONFIG_ETH_DW_0_NAME,
+DEVICE_INIT_CONFIG_DEFINE(eth_dw_0, CONFIG_ETH_DW_0_NAME,
 			   eth_initialize, &eth_config_0);
 SYS_DEFINE_DEVICE(eth_dw_0, &eth_0_runtime, NANOKERNEL,
 					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);

drivers/gpio/gpio_dw.c

@@ -448,7 +448,7 @@ struct gpio_dw_config gpio_config_0 = {
 
 struct gpio_dw_runtime gpio_0_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_dw_0, CONFIG_GPIO_DW_0_NAME,
+DEVICE_INIT_CONFIG_DEFINE(gpio_dw_0, CONFIG_GPIO_DW_0_NAME,
 			   gpio_dw_initialize, &gpio_config_0);
 SYS_DEFINE_DEVICE(gpio_dw_0, &gpio_0_runtime, SECONDARY,
 		  CONFIG_GPIO_DW_INIT_PRIORITY);
@@ -523,7 +523,7 @@ struct gpio_dw_config gpio_dw_config_1 = {
 
 struct gpio_dw_runtime gpio_1_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_dw_1, CONFIG_GPIO_DW_1_NAME,
+DEVICE_INIT_CONFIG_DEFINE(gpio_dw_1, CONFIG_GPIO_DW_1_NAME,
 			   gpio_dw_initialize, &gpio_dw_config_1);
 
 SYS_DEFINE_DEVICE(gpio_dw_1, &gpio_1_runtime, SECONDARY,

drivers/gpio/gpio_mmio.c

@@ -338,7 +338,7 @@ static struct gpio_mmio_config gpio_mmio_0_cfg = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_0,
+DEVICE_INIT_CONFIG_DEFINE(gpio_mmio_0,
 			   CONFIG_GPIO_MMIO_0_DEV_NAME,
 			   gpio_mmio_init,
 			   &gpio_mmio_0_cfg);
@@ -371,7 +371,7 @@ static struct gpio_mmio_config gpio_mmio_1_cfg = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_1,
+DEVICE_INIT_CONFIG_DEFINE(gpio_mmio_1,
 			   CONFIG_GPIO_MMIO_1_DEV_NAME,
 			   gpio_mmio_init,
 			   &gpio_mmio_1_cfg);

drivers/gpio/gpio_pcal9535a.c

@@ -617,7 +617,7 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_0_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_pcal9535a_0,
+DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_0,
 			   CONFIG_GPIO_PCAL9535A_0_DEV_NAME,
 			   gpio_pcal9535a_init, &gpio_pcal9535a_0_cfg);
 
@@ -646,7 +646,7 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_1_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_pcal9535a_1,
+DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_1,
 			   CONFIG_GPIO_PCAL9535A_1_DEV_NAME,
 			   gpio_pcal9535a_init, &gpio_pcal9535a_1_cfg);
 
@@ -675,7 +675,7 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_2_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_pcal9535a_2,
+DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_2,
 			   CONFIG_GPIO_PCAL9535A_2_DEV_NAME,
 			   gpio_pcal9535a_init, &gpio_pcal9535a_2_cfg);
 
@@ -704,7 +704,7 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_3_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_pcal9535a_3,
+DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_3,
 			   CONFIG_GPIO_PCAL9535A_3_DEV_NAME,
 			   gpio_pcal9535a_init, &gpio_pcal9535a_3_cfg);
 

drivers/gpio/gpio_qmsi.c

@@ -277,7 +277,7 @@ static struct gpio_qmsi_config gpio_0_config = {
 
 static struct gpio_qmsi_runtime gpio_0_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_0, CONFIG_GPIO_QMSI_0_NAME,
+DEVICE_INIT_CONFIG_DEFINE(gpio_0, CONFIG_GPIO_QMSI_0_NAME,
 			   &gpio_qmsi_init, &gpio_0_config);
 
 SYS_DEFINE_DEVICE(gpio_0, &gpio_0_runtime, SECONDARY,

drivers/gpio/gpio_sch.c

@@ -359,7 +359,7 @@ struct gpio_sch_config gpio_sch_0_config = {
 
 struct gpio_sch_data gpio_data_0;
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_0, CONFIG_GPIO_SCH_0_DEV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(gpio_0, CONFIG_GPIO_SCH_0_DEV_NAME,
 			   gpio_sch_init, &gpio_sch_0_config);
 SYS_DEFINE_DEVICE(gpio_0, &gpio_data_0, SECONDARY,
 		  CONFIG_GPIO_SCH_INIT_PRIORITY);
@@ -374,7 +374,7 @@ struct gpio_sch_config gpio_sch_1_config = {
 
 struct gpio_sch_data gpio_data_1;
 
-DECLARE_DEVICE_INIT_CONFIG(gpio_1, CONFIG_GPIO_SCH_1_DEV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(gpio_1, CONFIG_GPIO_SCH_1_DEV_NAME,
 			   gpio_sch_init, &gpio_sch_1_config);
 SYS_DEFINE_DEVICE(gpio_1, &gpio_data_1, SECONDARY,
 		  CONFIG_GPIO_SCH_INIT_PRIORITY);

drivers/grove/lcd_rgb.c

@@ -354,7 +354,7 @@ struct glcd_data grove_lcd_driver = {
 	.function = 0,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(grove_lcd,
+DEVICE_INIT_CONFIG_DEFINE(grove_lcd,
 			   GROVE_LCD_NAME,
 			   glcd_initialize,
 			   &grove_lcd_config);

drivers/i2c/i2c_dw.c

@@ -773,7 +773,7 @@ struct i2c_dw_dev_config i2c_0_runtime = {
 	.app_config.raw = CONFIG_I2C_DW_0_DEFAULT_CFG,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(i2c_0,
+DEVICE_INIT_CONFIG_DEFINE(i2c_0,
 			   CONFIG_I2C_DW_0_NAME,
 			   &i2c_dw_initialize,
 			   &i2c_config_dw_0);
@@ -826,7 +826,7 @@ struct i2c_dw_dev_config i2c_1_runtime = {
 	.app_config.raw = CONFIG_I2C_DW_1_DEFAULT_CFG,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(i2c_1,
+DEVICE_INIT_CONFIG_DEFINE(i2c_1,
 			   CONFIG_I2C_DW_1_NAME,
 			   &i2c_dw_initialize,
 			   &i2c_config_dw_1);

drivers/i2c/i2c_qmsi.c

@@ -115,7 +115,7 @@ static int i2c_qmsi_init(struct device *dev)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(i2c_qmsi_0, CONFIG_I2C_QMSI_0_NAME, i2c_qmsi_init,
+DEVICE_INIT_CONFIG_DEFINE(i2c_qmsi_0, CONFIG_I2C_QMSI_0_NAME, i2c_qmsi_init,
 			   NULL);
 
 SYS_DEFINE_DEVICE(i2c_qmsi_0, 0, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);

drivers/i2c/i2c_quark_se_ss.c

@@ -657,7 +657,7 @@ struct i2c_qse_ss_dev_config i2c_ss_0_runtime = {
 	.app_config.raw = CONFIG_I2C_QUARK_SE_SS_0_DEFAULT_CFG,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(i2c_ss_0,
+DEVICE_INIT_CONFIG_DEFINE(i2c_ss_0,
 			   CONFIG_I2C_QUARK_SE_SS_0_NAME,
 			   &i2c_qse_ss_initialize,
 			   &i2c_config_ss_0);
@@ -722,7 +722,7 @@ struct i2c_qse_ss_dev_config i2c_qse_ss_1_runtime = {
 	.app_config.raw = CONFIG_I2C_QUARK_SE_SS_1_DEFAULT_CFG,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(i2c_ss_1,
+DEVICE_INIT_CONFIG_DEFINE(i2c_ss_1,
 			   CONFIG_I2C_QUARK_SE_SS_1_NAME,
 			   &i2c_qse_ss_initialize,
 			   &i2c_config_ss_1);

drivers/interrupt_controller/i8259.c

@@ -62,6 +62,6 @@ int _i8259_init(struct device *unused)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(pic_0, "", _i8259_init, NULL);
 SYS_DEFINE_DEVICE(pic_0, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

drivers/interrupt_controller/ioapic_intr.c

@@ -314,6 +314,6 @@ static void _IoApicRedUpdateLo(unsigned int irq,
 	ioApicRedSetLo(irq, (ioApicRedGetLo(irq) & ~mask) | (value & mask));
 }
 
-DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(ioapic_0, "", _ioapic_init, NULL);
 SYS_DEFINE_DEVICE(ioapic_0, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

drivers/interrupt_controller/loapic_intr.c

@@ -444,7 +444,7 @@ int _loapic_isr_vector_get(void)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(loapic_0, "", _loapic_init, NULL);
 SYS_DEFINE_DEVICE(loapic_0, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 

drivers/ipm/ipm_quark_se.h

@@ -137,7 +137,7 @@ int quark_se_ipm_controller_initialize(struct device *d);
 		.direction = dir \
 	}; \
 	struct quark_se_ipm_driver_data quark_se_ipm_runtime_##name; \
-	DECLARE_DEVICE_INIT_CONFIG(name, _STRINGIFY(name), \
+	DEVICE_INIT_CONFIG_DEFINE(name, _STRINGIFY(name), \
 				   quark_se_ipm_initialize, \
 				   &quark_se_ipm_config_##name); \
 	SYS_DEFINE_DEVICE(name, &quark_se_ipm_runtime_##name, SECONDARY, \

drivers/pwm/pwm_dw.c

@@ -246,7 +246,7 @@ static struct pwm_dw_config pwm_dw_cfg = {
 	.num_ports = CONFIG_PWM_DW_NUM_PORTS,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(pwm_dw_0,
+DEVICE_INIT_CONFIG_DEFINE(pwm_dw_0,
 			   CONFIG_PWM_DW_DEV_NAME,
 			   pwm_dw_init, &pwm_dw_cfg);
 

drivers/pwm/pwm_pca9685.c

@@ -230,7 +230,7 @@ static struct pwm_pca9685_config pwm_pca9685_0_cfg = {
 
 static struct pwm_pca9685_drv_data pwm_pca9685_0_drvdata;
 
-DECLARE_DEVICE_INIT_CONFIG(pwm_pca9685_0,
+DEVICE_INIT_CONFIG_DEFINE(pwm_pca9685_0,
 			   CONFIG_PWM_PCA9685_0_DEV_NAME,
 			   pwm_pca9685_init, &pwm_pca9685_0_cfg);
 

drivers/rtc/rtc_dw.c

@@ -200,7 +200,7 @@ struct rtc_dw_dev_config rtc_dev = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(rtc, CONFIG_RTC_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(rtc, CONFIG_RTC_DRV_NAME,
 			   &rtc_dw_init, &rtc_dev);
 
 SYS_DEFINE_DEVICE(rtc, &rtc_runtime, SECONDARY,

drivers/rtc/rtc_qmsi.c

@@ -92,7 +92,7 @@ static int rtc_qmsi_init(struct device *dev)
 	return DEV_OK;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(rtc, CONFIG_RTC_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(rtc, CONFIG_RTC_DRV_NAME,
 			   &rtc_qmsi_init, NULL);
 
 SYS_DEFINE_DEVICE(rtc, NULL, SECONDARY,

drivers/serial/uart_atmel_sam3.c

@@ -259,7 +259,7 @@ static struct uart_sam3_dev_data_t uart_sam3_dev_data_0 = {
 	.baud_rate = CONFIG_UART_ATMEL_SAM3_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_sam3_0,
+DEVICE_INIT_CONFIG_DEFINE(uart_sam3_0,
 			   CONFIG_UART_ATMEL_SAM3_NAME,
 			   &uart_sam3_init,
 			   &uart_sam3_dev_cfg_0);

drivers/serial/uart_k20.c

@@ -376,7 +376,7 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_0 = {
 	.baud_rate = CONFIG_UART_K20_PORT_0_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_k20_0,
+DEVICE_INIT_CONFIG_DEFINE(uart_k20_0,
 			   CONFIG_UART_K20_PORT_0_NAME,
 			   &uart_k20_init,
 			   &uart_k20_dev_cfg_0);
@@ -397,7 +397,7 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_1 = {
 	.baud_rate = CONFIG_UART_K20_PORT_1_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_k20_1,
+DEVICE_INIT_CONFIG_DEFINE(uart_k20_1,
 			   CONFIG_UART_K20_PORT_1_NAME,
 			   &uart_k20_init,
 			   &uart_k20_dev_cfg_1);
@@ -418,7 +418,7 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_2 = {
 	.baud_rate = CONFIG_UART_K20_PORT_2_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_k20_2,
+DEVICE_INIT_CONFIG_DEFINE(uart_k20_2,
 			   CONFIG_UART_K20_PORT_2_NAME,
 			   &uart_k20_init,
 			   &uart_k20_dev_cfg_2);
@@ -439,7 +439,7 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_3 = {
 	.baud_rate = CONFIG_UART_K20_PORT_3_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_k20_3,
+DEVICE_INIT_CONFIG_DEFINE(uart_k20_3,
 			   CONFIG_UART_K20_PORT_3_NAME,
 			   &uart_k20_init,
 			   &uart_k20_dev_cfg_3);
@@ -460,7 +460,7 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_4 = {
 	.baud_rate = CONFIG_UART_K20_PORT_4_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_k20_4,
+DEVICE_INIT_CONFIG_DEFINE(uart_k20_4,
 			   CONFIG_UART_K20_PORT_4_NAME,
 			   &uart_k20_init,
 			   &uart_k20_dev_cfg_4);

drivers/serial/uart_ns16550.c

@@ -702,7 +702,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_0 = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_ns16550_0,
+DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_0,
 			   CONFIG_UART_NS16550_PORT_0_NAME,
 			   &uart_ns16550_init,
 			   &uart_ns16550_dev_cfg_0);
@@ -738,7 +738,7 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_1 = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_ns16550_1,
+DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_1,
 			   CONFIG_UART_NS16550_PORT_1_NAME,
 			   &uart_ns16550_init,
 			   &uart_ns16550_dev_cfg_1);

drivers/serial/uart_nsim.c

@@ -83,7 +83,7 @@ static struct uart_device_config uart_nsim_dev_cfg_0 = {
 	.regs = CONFIG_UART_NSIM_PORT_0_BASE_ADDR,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_nsim0,
+DEVICE_INIT_CONFIG_DEFINE(uart_nsim0,
 			   CONFIG_UART_NSIM_PORT_0_NAME,
 			   &uart_nsim_init,
 			   &uart_nsim_dev_cfg_0);

drivers/serial/uart_stellaris.c

@@ -602,7 +602,7 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_0 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_0_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_stellaris0,
+DEVICE_INIT_CONFIG_DEFINE(uart_stellaris0,
 			   CONFIG_UART_STELLARIS_PORT_0_NAME,
 			   &uart_stellaris_init,
 			   &uart_stellaris_dev_cfg_0);
@@ -623,7 +623,7 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_1 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_1_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_stellaris1,
+DEVICE_INIT_CONFIG_DEFINE(uart_stellaris1,
 			   CONFIG_UART_STELLARIS_PORT_1_NAME,
 			   &uart_stellaris_init,
 			   &uart_stellaris_dev_cfg_1);
@@ -644,7 +644,7 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_2 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_2_BAUD_RATE,
 };
 
-DECLARE_DEVICE_INIT_CONFIG(uart_stellaris2,
+DEVICE_INIT_CONFIG_DEFINE(uart_stellaris2,
 			   CONFIG_UART_STELLARIS_PORT_2_NAME,
 			   &uart_stellaris_init,
 			   &uart_stellaris_dev_cfg_2);

drivers/shared_irq/shared_irq.c

@@ -144,7 +144,7 @@ struct shared_irq_config shared_irq_config_0 = {
 
 struct shared_irq_runtime shared_irq_0_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(shared_irq_0, CONFIG_SHARED_IRQ_0_NAME,
+DEVICE_INIT_CONFIG_DEFINE(shared_irq_0, CONFIG_SHARED_IRQ_0_NAME,
 			   shared_irq_initialize, &shared_irq_config_0);
 SYS_DEFINE_DEVICE(shared_irq_0, &shared_irq_0_runtime, SECONDARY,
 		  CONFIG_SHARED_IRQ_INIT_PRIORITY);
@@ -185,7 +185,7 @@ struct shared_irq_config shared_irq_config_1 = {
 
 struct shared_irq_runtime shared_irq_1_runtime;
 
-DECLARE_DEVICE_INIT_CONFIG(shared_irq_1, CONFIG_SHARED_IRQ_1_NAME,
+DEVICE_INIT_CONFIG_DEFINE(shared_irq_1, CONFIG_SHARED_IRQ_1_NAME,
 			   shared_irq_initialize, &shared_irq_config_1);
 SYS_DEFINE_DEVICE(shared_irq_1, &shared_irq_1_runtime, SECONDARY,
 		  CONFIG_SHARED_IRQ_INIT_PRIORITY);

drivers/spi/spi_dw.c

@@ -582,7 +582,7 @@ struct spi_dw_config spi_dw_config_0 = {
 	.config_func = spi_config_0_irq
 };
 
-DECLARE_DEVICE_INIT_CONFIG(spi_dw_port_0, CONFIG_SPI_DW_PORT_0_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(spi_dw_port_0, CONFIG_SPI_DW_PORT_0_DRV_NAME,
 			   spi_dw_init, &spi_dw_config_0);
 
 SYS_DEFINE_DEVICE(spi_dw_port_0, &spi_dw_data_port_0, SECONDARY,
@@ -615,7 +615,7 @@ struct spi_dw_config spi_dw_config_1 = {
 	.config_func = spi_config_1_irq
 };
 
-DECLARE_DEVICE_INIT_CONFIG(spi_dw_port_1, CONFIG_SPI_DW_PORT_1_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(spi_dw_port_1, CONFIG_SPI_DW_PORT_1_DRV_NAME,
 			   spi_dw_init, &spi_dw_config_1);
 
 SYS_DEFINE_DEVICE(spi_dw_port_1, &spi_dw_data_port_1, SECONDARY,

drivers/spi/spi_intel.c

@@ -467,7 +467,7 @@ struct spi_intel_config spi_intel_config_0 = {
 	.config_func = spi_config_0_irq
 };
 
-DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME,
 			   spi_intel_init, &spi_intel_config_0);
 
 /* SPI may use GPIO pin for CS, thus it needs to be initialized after GPIO */
@@ -506,7 +506,7 @@ struct spi_intel_config spi_intel_config_1 = {
 	.config_func = spi_config_1_irq
 };
 
-DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME,
 			   spi_intel_init, &spi_intel_config_1);
 
 /* SPI may use GPIO pin for CS, thus it needs to be initialized after GPIO */

drivers/timer/sys_clock_init.c

@@ -32,7 +32,7 @@
 #include <init.h>
 #include <drivers/system_timer.h>
 
-DECLARE_DEVICE_INIT_CONFIG(sys_clock, "sys_clock",
+DEVICE_INIT_CONFIG_DEFINE(sys_clock, "sys_clock",
 			   _sys_clock_driver_init, NULL);
 
 SYS_DEFINE_DEVICE(sys_clock, NULL, NANOKERNEL,

drivers/watchdog/wdt_dw.c

@@ -160,7 +160,7 @@ struct wdt_dw_dev_config wdt_dev = {
 #endif
 };
 
-DECLARE_DEVICE_INIT_CONFIG(wdt, CONFIG_WDT_DW_DRV_NAME,
+DEVICE_INIT_CONFIG_DEFINE(wdt, CONFIG_WDT_DW_DRV_NAME,
 			   &wdt_dw_init, &wdt_dev);
 
 SYS_DEFINE_DEVICE(wdt, &wdt_runtime, SECONDARY,

drivers/watchdog/wdt_qmsi.c

@@ -98,7 +98,7 @@ static int init(struct device *dev)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(wdt, CONFIG_WDT_QMSI_DRV_NAME, init, 0);
+DEVICE_INIT_CONFIG_DEFINE(wdt, CONFIG_WDT_QMSI_DRV_NAME, init, 0);
 
 SYS_DEFINE_DEVICE(wdt, 0, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 

include/device.h

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-/** @def DECLARE_DEVICE_INIT_CONFIG
+/** @def DEVICE_INIT_CONFIG_DEFINE
  *
  *  @brief Define an config object
  *
@@ -42,7 +42,7 @@ extern "C" {
  *
  *  @sa __define_initconfig()
  */
-#define DECLARE_DEVICE_INIT_CONFIG(cfg_name, drv_name, init_fn, config) \
+#define DEVICE_INIT_CONFIG_DEFINE(cfg_name, drv_name, init_fn, config) \
 	static struct device_config config_##cfg_name	__used		\
 	__attribute__((__section__(".devconfig.init"))) = { \
 		.name = drv_name, .init = (init_fn), \

include/init.h

@@ -49,7 +49,7 @@ extern "C" {
  *  @param name Device name.
  *
  *  @param data Pointer to the device's configuration data.
- *  @sa DECLARE_DEVICE_INIT_CONFIG()
+ *  @sa DEVICE_INIT_CONFIG_DEFINE()
  *
  *  @param level The initialization level at which configuration occurs.
  *  Must be one of the following symbols, which are listed in the order

kernel/nanokernel/kernel_event_logger.c

@@ -53,7 +53,7 @@ static int _sys_k_event_logger_init(struct device *arg)
 
 	return 0;
 }
-DECLARE_DEVICE_INIT_CONFIG(kernel_event_logger_0, "",
+DEVICE_INIT_CONFIG_DEFINE(kernel_event_logger_0, "",
 	_sys_k_event_logger_init, NULL);
 SYS_DEFINE_DEVICE(kernel_event_logger_0, NULL, NANOKERNEL,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

misc/debug/mem_safe_check_boundaries.c

@@ -290,6 +290,6 @@ static int init(struct device *unused)
 	return 0;
 }
 
-DECLARE_DEVICE_INIT_CONFIG(mem_safe, "", init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(mem_safe, "", init, NULL);
 SYS_DEFINE_DEVICE(mem_safe, NULL, PRIMARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

samples/nanokernel/test/test_ipm/src/test_ipm.c

@@ -40,7 +40,7 @@
 
 /* Set up the dummy IPM driver */
 struct ipm_dummy_driver_data ipm_dummy0_driver_data;
-DECLARE_DEVICE_INIT_CONFIG(ipm_dummy0, "ipm_dummy0", ipm_dummy_init, NULL);
+DEVICE_INIT_CONFIG_DEFINE(ipm_dummy0, "ipm_dummy0", ipm_dummy_init, NULL);
 SYS_DEFINE_DEVICE(ipm_dummy0, &ipm_dummy0_driver_data, SECONDARY,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
@@ -51,7 +51,7 @@ struct ipm_console_sender_config_info sender_config = {
 	.bind_to = "ipm_dummy0",
 	.flags = SOURCE
 };
-DECLARE_DEVICE_INIT_CONFIG(ipm_console_send0, "ipm_send0",
+DEVICE_INIT_CONFIG_DEFINE(ipm_console_send0, "ipm_send0",
 			   ipm_console_sender_init, &sender_config);
 SYS_DEFINE_DEVICE(ipm_console_send0, NULL, NANOKERNEL,
 		  INIT_PRIO_IPM_SEND);
@@ -78,7 +78,7 @@ struct ipm_console_receiver_config_info receiver_config = {
 };
 
 struct ipm_console_receiver_runtime_data receiver_data;
-DECLARE_DEVICE_INIT_CONFIG(ipm_console_recv0, "ipm_recv0",
+DEVICE_INIT_CONFIG_DEFINE(ipm_console_recv0, "ipm_recv0",
 			   ipm_console_receiver_init, &receiver_config);
 SYS_DEFINE_DEVICE(ipm_console_recv0, &receiver_data, NANOKERNEL,
 		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);