diff --git a/arch/arc/soc/quark_se_ss/soc.c b/arch/arc/soc/quark_se_ss/soc.c
index 31ef9297fc9..763a6b228ce 100644
--- a/arch/arc/soc/quark_se_ss/soc.c
+++ b/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;
 }
-DEVICE_INIT_CONFIG_DEFINE(quark_se_arc_0, "", quark_se_arc_init, NULL);
-DEVICE_DEFINE(quark_se_arc_0, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(quark_se_arc_0, "", quark_se_arc_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/arch/arc/soc/quark_se_ss/soc_config.c b/arch/arc/soc/quark_se_ss/soc_config.c
index b77449692d3..cf1ff05c094 100644
--- a/arch/arc/soc/quark_se_ss/soc_config.c
+++ b/arch/arc/soc/quark_se_ss/soc_config.c
@@ -33,10 +33,9 @@ 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
 };
-DEVICE_INIT_CONFIG_DEFINE(quark_se_ipm, "", quark_se_ipm_controller_initialize,
-			   &ipm_controller_config);
-DEVICE_DEFINE(quark_se_ipm, NULL, SECONDARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(quark_se_ipm, "", quark_se_ipm_controller_initialize,
+				NULL, &ipm_controller_config,
+				SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #if CONFIG_IPM_CONSOLE_SENDER
 #include <console/ipm_console.h>
@@ -46,10 +45,9 @@ struct ipm_console_sender_config_info quark_se_ipm_sender_config = {
 	.bind_to = "quark_se_ipm4",
 	.flags = IPM_CONSOLE_PRINTK | IPM_CONSOLE_STDOUT,
 };
-DEVICE_INIT_CONFIG_DEFINE(ipm_console, "ipm_console",
-			   ipm_console_sender_init,
-			   &quark_se_ipm_sender_config);
-DEVICE_DEFINE(ipm_console, NULL, SECONDARY, CONFIG_IPM_CONSOLE_PRIORITY);
+DEVICE_INIT(ipm_console, "ipm_console", ipm_console_sender_init,
+				NULL, &quark_se_ipm_sender_config,
+				SECONDARY, CONFIG_IPM_CONSOLE_PRIORITY);
 
 #endif /* CONFIG_IPM_CONSOLE_SENDER */
 #endif /* CONFIG_IPM_QUARK_SE */
@@ -73,8 +71,8 @@ static int uart_ns16550_init(struct device *dev)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_init, "", uart_ns16550_init, NULL);
-DEVICE_DEFINE(uart_ns16550_init, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(uart_ns16550_init, "", uart_ns16550_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif /* CONFIG_UART_NS16550 */
diff --git a/arch/arm/soc/atmel_sam3/soc.c b/arch/arm/soc/atmel_sam3/soc.c
index c84af161154..627f30911f9 100644
--- a/arch/arm/soc/atmel_sam3/soc.c
+++ b/arch/arm/soc/atmel_sam3/soc.c
@@ -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);
diff --git a/arch/arm/soc/fsl_frdm_k64f/soc.c b/arch/arm/soc/fsl_frdm_k64f/soc.c
index b2cb65dc39e..2dcb3a0d94b 100644
--- a/arch/arm/soc/fsl_frdm_k64f/soc.c
+++ b/arch/arm/soc/fsl_frdm_k64f/soc.c
@@ -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);
diff --git a/arch/arm/soc/fsl_frdm_k64f/soc_config.c b/arch/arm/soc/fsl_frdm_k64f/soc_config.c
index 5fb5ac1bced..c1f4febb274 100644
--- a/arch/arm/soc/fsl_frdm_k64f/soc_config.c
+++ b/arch/arm/soc/fsl_frdm_k64f/soc_config.c
@@ -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 */
diff --git a/arch/arm/soc/ti_lm3s6965/soc.c b/arch/arm/soc/ti_lm3s6965/soc.c
index e1085096ad6..70f9db9dc9a 100644
--- a/arch/arm/soc/ti_lm3s6965/soc.c
+++ b/arch/arm/soc/ti_lm3s6965/soc.c
@@ -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);
diff --git a/arch/arm/soc/ti_lm3s6965/soc_config.c b/arch/arm/soc/ti_lm3s6965/soc_config.c
index 0f4f74ec43c..c6fd2b02f35 100644
--- a/arch/arm/soc/ti_lm3s6965/soc_config.c
+++ b/arch/arm/soc/ti_lm3s6965/soc_config.c
@@ -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 */
diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c
index 971446783cb..d0bf5dfac13 100644
--- a/arch/x86/core/cache.c
+++ b/arch/x86/core/cache.c
@@ -107,7 +107,8 @@ static int init_cache(struct device *unused)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(cache, "", init_cache, NULL);
-DEVICE_DEFINE(cache, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(cache, "", init_cache,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif /* CONFIG_CLFLUSH_DETECT || CONFIG_CACHE_LINE_SIZE_DETECT */
diff --git a/arch/x86/soc/quark_d2000/soc.c b/arch/x86/soc/quark_d2000/soc.c
index 072d193c728..06080443093 100644
--- a/arch/x86/soc/quark_d2000/soc.c
+++ b/arch/x86/soc/quark_d2000/soc.c
@@ -62,11 +62,12 @@ static int quark_d2000_init(struct device *arg)
 
 	return 0;
 }
-DEVICE_INIT_CONFIG_DEFINE(quark_d2000_0, "", quark_d2000_init, NULL);
-DEVICE_DEFINE(quark_d2000_0, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(quark_d2000_0, "", quark_d2000_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #ifdef CONFIG_MVIC
-DEVICE_INIT_CONFIG_DEFINE(mvic_0, "", _mvic_init, NULL);
-DEVICE_DEFINE(mvic_0, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(mvic_0, "", _mvic_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 #endif /* CONFIG_IOAPIC */
diff --git a/arch/x86/soc/quark_se/soc.c b/arch/x86/soc/quark_se/soc.c
index 8d0a2445539..0e781f07c4f 100644
--- a/arch/x86/soc/quark_se/soc.c
+++ b/arch/x86/soc/quark_se/soc.c
@@ -86,9 +86,9 @@ static int arc_init(struct device *arg)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(quark_se_ss_0, "", arc_init, NULL);
-DEVICE_DEFINE(quark_se_ss_0, NULL, SECONDARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(quark_se_ss_0, "", arc_init,
+				NULL, NULL,
+				SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif /*CONFIG_ARC_INIT*/
 
@@ -110,9 +110,9 @@ static int platform_uart_init(struct device *arg)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(platform_uart_init, "", platform_uart_init, NULL);
-DEVICE_DEFINE(platform_uart_init, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(platform_uart_init, "", platform_uart_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #endif /* CONFIG_UART_INTERRUPT_DRIVEN */
 #endif /* CONFIG_UART_NS16550 */
diff --git a/arch/x86/soc/quark_se/soc_config.c b/arch/x86/soc/quark_se/soc_config.c
index 045fb0de2f6..81035ade0a2 100644
--- a/arch/x86/soc/quark_se/soc_config.c
+++ b/arch/x86/soc/quark_se/soc_config.c
@@ -38,10 +38,9 @@ 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
 };
-DEVICE_INIT_CONFIG_DEFINE(quark_se_ipm, "", quark_se_ipm_controller_initialize,
-			   &ipm_controller_config);
-DEVICE_DEFINE(quark_se_ipm, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(quark_se_ipm, "", quark_se_ipm_controller_initialize,
+				NULL, &ipm_controller_config,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #if defined(CONFIG_IPM_CONSOLE_RECEIVER) && defined(CONFIG_PRINTK)
 #include <console/ipm_console.h>
@@ -64,11 +63,9 @@ 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;
-DEVICE_INIT_CONFIG_DEFINE(ipm_console0, "ipm_console0",
-			   ipm_console_receiver_init,
-			   &quark_se_ipm_receiver_config);
-DEVICE_DEFINE(ipm_console0, &quark_se_ipm_receiver_driver_data,
-					SECONDARY, CONFIG_IPM_CONSOLE_PRIORITY);
+DEVICE_INIT(ipm_console0, "ipm_console0", ipm_console_receiver_init,
+				&quark_se_ipm_receiver_driver_data, &quark_se_ipm_receiver_config,
+				SECONDARY, CONFIG_IPM_CONSOLE_PRIORITY);
 
 #endif /* CONFIG_PRINTK && CONFIG_IPM_CONSOLE_RECEIVER */
 #endif /* CONFIG_IPM_QUARK_SE */
diff --git a/arch/x86/soc/quark_x1000/soc.c b/arch/x86/soc/quark_x1000/soc.c
index 3dd3010480d..71852e66563 100644
--- a/arch/x86/soc/quark_x1000/soc.c
+++ b/arch/x86/soc/quark_x1000/soc.c
@@ -67,7 +67,7 @@ static int pci_legacy_bridge_irq_config(struct device *unused)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(pci_legacy_bridge_0, "", pci_legacy_bridge_irq_config, NULL);
-DEVICE_DEFINE(pci_legacy_bridge_0, NULL, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(pci_legacy_bridge_0, "", pci_legacy_bridge_irq_config,
+				NULL, NULL,
+				SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 #endif /* CONFIG_PCI_LEGACY_BRIDGE */
diff --git a/boards/arduino_101/pinmux.c b/boards/arduino_101/pinmux.c
index c1e8ad917a7..def0a86ca0a 100644
--- a/boards/arduino_101/pinmux.c
+++ b/boards/arduino_101/pinmux.c
@@ -362,9 +362,6 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
-			   PINMUX_NAME,			/* driver name */
-			   &pinmux_initialize,		/* init function */
-			   &board_pmux);		/* config options*/
-
-DEVICE_DEFINE(pmux, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_initialize,
+			NULL, &board_pmux,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/boards/galileo/galileo_pinmux.c b/boards/galileo/galileo_pinmux.c
index 8be996cd582..125e4426a3c 100644
--- a/boards/galileo/galileo_pinmux.c
+++ b/boards/galileo/galileo_pinmux.c
@@ -765,11 +765,6 @@ struct pinmux_config galileo_pmux = {
 	.base_address = 0x00000000,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pmux,
-			  PINMUX_NAME,
-			  &pinmux_galileo_initialize,
-			  &galileo_pmux);
-
 struct galileo_data galileo_pinmux_driver = {
 	.exp0 = NULL,
 	.exp1 = NULL,
@@ -784,5 +779,6 @@ struct galileo_data galileo_pinmux_driver = {
  * 1 - PCA9535 and PCAL9685
  * 2 - pinmux
  */
-DEVICE_DEFINE(pmux, &galileo_pinmux_driver, SECONDARY,
-		  CONFIG_PINMUX_INIT_PRIORITY);
+DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_galileo_initialize,
+			&galileo_pinmux_driver, &galileo_pmux,
+			SECONDARY, CONFIG_PINMUX_INIT_PRIORITY);
diff --git a/boards/quark_d2000_crb/pinmux.c b/boards/quark_d2000_crb/pinmux.c
index 443f557af21..706e3888114 100644
--- a/boards/quark_d2000_crb/pinmux.c
+++ b/boards/quark_d2000_crb/pinmux.c
@@ -288,9 +288,6 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
-			   PINMUX_NAME,			/* driver name */
-			   &pinmux_initialize,		/* init function */
-			   &board_pmux);		/* config options*/
-
-DEVICE_DEFINE(pmux, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_initialize,
+			NULL, &board_pmux,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/boards/quark_se_ctb/pinmux.c b/boards/quark_se_ctb/pinmux.c
index 21dc47e0d5d..37a90f1ef77 100644
--- a/boards/quark_se_ctb/pinmux.c
+++ b/boards/quark_se_ctb/pinmux.c
@@ -345,9 +345,6 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
-			   PINMUX_NAME,			/* driver name */
-			   &pinmux_initialize,		/* init function */
-			   &board_pmux);		/* config options*/
-
-DEVICE_DEFINE(pmux, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_initialize,
+			NULL, &board_pmux,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/boards/quark_se_devboard/pinmux.c b/boards/quark_se_devboard/pinmux.c
index ddded3d6ec0..97071530ddf 100644
--- a/boards/quark_se_devboard/pinmux.c
+++ b/boards/quark_se_devboard/pinmux.c
@@ -347,9 +347,6 @@ struct pinmux_config board_pmux = {
 	.base_address = CONFIG_PINMUX_BASE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pmux,			/* config name */
-			   PINMUX_NAME,			/* driver name */
-			   &pinmux_initialize,		/* init function */
-			   &board_pmux);		/* config options*/
-
-DEVICE_DEFINE(pmux, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(pmux, PINMUX_NAME, &pinmux_initialize,
+			NULL, &board_pmux,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c
index 9ee5f1e1126..72c32698107 100644
--- a/drivers/adc/adc_dw.c
+++ b/drivers/adc/adc_dw.c
@@ -529,13 +529,9 @@ struct adc_config adc_config_dev_0 = {
 		.config_func  = adc_config_0_irq,
 	};
 
-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*/
-
-DEVICE_DEFINE(adc_dw_0, &adc_info_dev_0, SECONDARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(adc_dw_0, CONFIG_ADC_DW_NAME_0, &adc_dw_init,
+			&adc_info_dev_0, &adc_config_dev_0,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 static void adc_config_0_irq(void)
 {
diff --git a/drivers/adc/adc_ti_adc108s102.c b/drivers/adc/adc_ti_adc108s102.c
index b7c24a6944e..bd413be21d4 100644
--- a/drivers/adc/adc_ti_adc108s102.c
+++ b/drivers/adc/adc_ti_adc108s102.c
@@ -243,10 +243,9 @@ struct ti_adc108s102_config adc108s102_0_config = {
 	.spi_slave = CONFIG_ADC_TI_ADC108S102_0_SPI_SLAVE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(adc108s102_0, CONFIG_ADC_TI_ADC108S102_0_DRV_NAME,
-			   ti_adc108s102_init, &adc108s102_0_config);
-
-DEVICE_DEFINE(adc108s102_0, &adc108s102_0_data, SECONDARY,
-		  CONFIG_ADC_TI_ADC108S102_INIT_PRIORITY);
+DEVICE_INIT(adc108s102_0, CONFIG_ADC_TI_ADC108S102_0_DRV_NAME,
+			ti_adc108s102_init,
+			&adc108s102_0_data, &adc108s102_0_config,
+			SECONDARY, CONFIG_ADC_TI_ADC108S102_INIT_PRIORITY);
 
 #endif /* CONFIG_ADC_TI_ADC108S102_0 */
diff --git a/drivers/aio/aio_dw_comparator.c b/drivers/aio/aio_dw_comparator.c
index ebbad9b55c1..281c5679e6c 100644
--- a/drivers/aio/aio_dw_comparator.c
+++ b/drivers/aio/aio_dw_comparator.c
@@ -201,17 +201,13 @@ struct dw_aio_cmp_dev_cfg_t dw_aio_cmp_dev_config = {
 	.config_func = dw_aio_cmp_config,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(dw_aio_cmp,
-			   AIO_DW_CMP_DRV_NAME,
-			   &dw_aio_cmp_init,
-			   &dw_aio_cmp_dev_config);
-
 struct dw_aio_cmp_dev_data_t dw_aio_cmp_dev_data = {
 	.num_cmp = AIO_DW_CMP_COUNT,
 };
 
-DEVICE_DEFINE(dw_aio_cmp, &dw_aio_cmp_dev_data, SECONDARY,
-	CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(dw_aio_cmp, AIO_DW_CMP_DRV_NAME, &dw_aio_cmp_init,
+			&dw_aio_cmp_dev_data, &dw_aio_cmp_dev_config,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 static int dw_aio_cmp_config(struct device *dev)
 {
diff --git a/drivers/bluetooth/h4.c b/drivers/bluetooth/h4.c
index ed04148d316..11faa01ef30 100644
--- a/drivers/bluetooth/h4.c
+++ b/drivers/bluetooth/h4.c
@@ -259,6 +259,6 @@ static int _bt_uart_init(struct device *unused)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(bt_uart, "", _bt_uart_init, NULL);
-DEVICE_DEFINE(bt_uart, NULL, NANOKERNEL,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(bt_uart, "", _bt_uart_init,
+				NULL, NULL,
+				NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/bluetooth/h5.c b/drivers/bluetooth/h5.c
index 75d7c01f180..ea4c3e90fb7 100644
--- a/drivers/bluetooth/h5.c
+++ b/drivers/bluetooth/h5.c
@@ -790,6 +790,6 @@ static int _bt_uart_init(struct device *unused)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(bt_uart, "", _bt_uart_init, NULL);
-DEVICE_DEFINE(bt_uart, NULL, NANOKERNEL,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(bt_uart, "", _bt_uart_init,
+				NULL, NULL,
+				NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
index 0ebad56e6dd..0efdcb623fc 100644
--- a/drivers/clock_control/quark_se_clock_control.c
+++ b/drivers/clock_control/quark_se_clock_control.c
@@ -101,13 +101,11 @@ struct quark_se_clock_control_config clock_quark_se_peripheral_config = {
 	.base_address = CLOCK_PERIPHERAL_BASE_ADDR
 };
 
-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);
-
-DEVICE_DEFINE(clock_quark_se_peripheral, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(clock_quark_se_peripheral,
+			CONFIG_CLOCK_CONTROL_QUARK_SE_PERIPHERAL_DRV_NAME,
+			&quark_se_clock_control_init,
+			NULL, &clock_quark_se_peripheral_config,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_CLOCK_CONTROL_QUARK_SE_PERIPHERAL */
 #ifdef CONFIG_CLOCK_CONTROL_QUARK_SE_EXTERNAL
@@ -116,13 +114,11 @@ struct quark_se_clock_control_config clock_quark_se_external_config = {
 	.base_address = CLOCK_EXTERNAL_BASE_ADDR
 };
 
-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);
-
-DEVICE_DEFINE(clock_quark_se_external, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(clock_quark_se_external,
+			CONFIG_CLOCK_CONTROL_QUARK_SE_EXTERNAL_DRV_NAME,
+			&quark_se_clock_control_init,
+			NULL, &clock_quark_se_external_config,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_CLOCK_CONTROL_QUARK_SE_EXTERNAL */
 #ifdef CONFIG_CLOCK_CONTROL_QUARK_SE_SENSOR
@@ -131,11 +127,10 @@ struct quark_se_clock_control_config clock_quark_se_sensor_config = {
 	.base_address = CLOCK_SENSOR_BASE_ADDR
 };
 
-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);
+DEVICE_INIT(clock_quark_se_sensor,
+			CONFIG_CLOCK_CONTROL_QUARK_SE_SENSOR_DRV_NAME,
+			&quark_se_clock_control_init,
+			NULL, &clock_quark_se_sensor_config,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
-DEVICE_DEFINE(clock_quark_se_sensor, NULL, PRIMARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 #endif /* CONFIG_CLOCK_CONTROL_QUARK_SE_SENSOR */
diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c
index 434045d29b4..ad4e0bfd9ea 100644
--- a/drivers/console/ram_console.c
+++ b/drivers/console/ram_console.c
@@ -45,6 +45,7 @@ static int ram_console_init(struct device *d)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(ram_console, "", ram_console_init, NULL);
-DEVICE_DEFINE(ram_console, NULL, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(ram_console, "", ram_console_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index c7b55bf84f5..7b67de1d9d4 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -429,11 +429,13 @@ static int uart_console_init(struct device *arg)
 
 	return DEV_OK;
 }
-DEVICE_INIT_CONFIG_DEFINE(uart_console, "", uart_console_init, NULL);
 
 /* UART consloe initializes after the UART device itself */
+DEVICE_INIT(uart_console, "", uart_console_init,
+			NULL, NULL,
 #if defined(CONFIG_EARLY_CONSOLE)
-DEVICE_DEFINE(uart_console, NULL, PRIMARY, CONFIG_UART_CONSOLE_PRIORITY);
+			PRIMARY,
 #else
-DEVICE_DEFINE(uart_console, NULL, SECONDARY, CONFIG_UART_CONSOLE_PRIORITY);
+			SECONDARY,
 #endif
+			CONFIG_UART_CONSOLE_PRIORITY);
diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c
index 5e45a352412..99c8b8d2a1d 100644
--- a/drivers/ethernet/eth_dw.c
+++ b/drivers/ethernet/eth_dw.c
@@ -303,10 +303,9 @@ static struct eth_config eth_config_0 = {
 
 static struct eth_runtime eth_0_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(eth_dw_0, CONFIG_ETH_DW_0_NAME,
-			   eth_initialize, &eth_config_0);
-DEVICE_DEFINE(eth_dw_0, &eth_0_runtime, NANOKERNEL,
-					CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(eth_dw_0, CONFIG_ETH_DW_0_NAME, eth_initialize,
+				&eth_0_runtime, &eth_config_0,
+				NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 static int eth_net_tx(struct net_buf *buf)
 {
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 394abbc7a7e..fb81bcc59d8 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -448,10 +448,9 @@ struct gpio_dw_config gpio_config_0 = {
 
 struct gpio_dw_runtime gpio_0_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_dw_0, CONFIG_GPIO_DW_0_NAME,
-			   gpio_dw_initialize, &gpio_config_0);
-DEVICE_DEFINE(gpio_dw_0, &gpio_0_runtime, SECONDARY,
-		  CONFIG_GPIO_DW_INIT_PRIORITY);
+DEVICE_INIT(gpio_dw_0, CONFIG_GPIO_DW_0_NAME, gpio_dw_initialize,
+				&gpio_0_runtime, &gpio_config_0,
+				SECONDARY, CONFIG_GPIO_DW_INIT_PRIORITY);
 
 #ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT
 #ifdef CONFIG_IOAPIC
@@ -523,11 +522,9 @@ struct gpio_dw_config gpio_dw_config_1 = {
 
 struct gpio_dw_runtime gpio_1_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_dw_1, CONFIG_GPIO_DW_1_NAME,
-			   gpio_dw_initialize, &gpio_dw_config_1);
-
-DEVICE_DEFINE(gpio_dw_1, &gpio_1_runtime, SECONDARY,
-		  CONFIG_GPIO_DW_INIT_PRIORITY);
+DEVICE_INIT(gpio_dw_1, CONFIG_GPIO_DW_1_NAME, gpio_dw_initialize,
+			&gpio_1_runtime, &gpio_dw_config_1,
+			SECONDARY, CONFIG_GPIO_DW_INIT_PRIORITY);
 
 #ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT
 #ifdef CONFIG_IOAPIC
diff --git a/drivers/gpio/gpio_mmio.c b/drivers/gpio/gpio_mmio.c
index d8a66348011..32546e57bdd 100644
--- a/drivers/gpio/gpio_mmio.c
+++ b/drivers/gpio/gpio_mmio.c
@@ -338,12 +338,9 @@ static struct gpio_mmio_config gpio_mmio_0_cfg = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_mmio_0,
-			   CONFIG_GPIO_MMIO_0_DEV_NAME,
-			   gpio_mmio_init,
-			   &gpio_mmio_0_cfg);
-DEVICE_DEFINE(gpio_mmio_0, (void *)0, SECONDARY,
-		  CONFIG_GPIO_MMIO_INIT_PRIORITY);
+DEVICE_INIT(gpio_mmio_0, CONFIG_GPIO_MMIO_0_DEV_NAME, gpio_mmio_init,
+				(void *)0, &gpio_mmio_0_cfg,
+				SECONDARY, CONFIG_GPIO_MMIO_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_MMIO_0 */
 
@@ -371,11 +368,8 @@ static struct gpio_mmio_config gpio_mmio_1_cfg = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_mmio_1,
-			   CONFIG_GPIO_MMIO_1_DEV_NAME,
-			   gpio_mmio_init,
-			   &gpio_mmio_1_cfg);
-DEVICE_DEFINE(gpio_mmio_1, (void *)0, SECONDARY,
-		  CONFIG_GPIO_MMIO_INIT_PRIORITY);
+DEVICE_INIT(gpio_mmio_1, CONFIG_GPIO_MMIO_1_DEV_NAME, gpio_mmio_init,
+				(void *)0, &gpio_mmio_1_cfg,
+				SECONDARY, CONFIG_GPIO_MMIO_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_MMIO_1 */
diff --git a/drivers/gpio/gpio_pcal9535a.c b/drivers/gpio/gpio_pcal9535a.c
index db2acc720f4..53d3c9fb15f 100644
--- a/drivers/gpio/gpio_pcal9535a.c
+++ b/drivers/gpio/gpio_pcal9535a.c
@@ -617,13 +617,11 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_0_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_0,
-			   CONFIG_GPIO_PCAL9535A_0_DEV_NAME,
-			   gpio_pcal9535a_init, &gpio_pcal9535a_0_cfg);
-
 /* This has to init after I2C master */
-DEVICE_DEFINE(gpio_pcal9535a_0, &gpio_pcal9535a_0_drvdata, SECONDARY,
-		  CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
+DEVICE_INIT(gpio_pcal9535a_0, CONFIG_GPIO_PCAL9535A_0_DEV_NAME,
+			gpio_pcal9535a_init,
+			&gpio_pcal9535a_0_drvdata, &gpio_pcal9535a_0_cfg,
+			SECONDARY, CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_PCAL9535A_0 */
 
@@ -646,13 +644,11 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_1_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_1,
-			   CONFIG_GPIO_PCAL9535A_1_DEV_NAME,
-			   gpio_pcal9535a_init, &gpio_pcal9535a_1_cfg);
-
 /* This has to init after I2C master */
-DEVICE_DEFINE(gpio_pcal9535a_1, &gpio_pcal9535a_1_drvdata, SECONDARY,
-		  CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
+DEVICE_INIT(gpio_pcal9535a_1, CONFIG_GPIO_PCAL9535A_1_DEV_NAME,
+			gpio_pcal9535a_init,
+			&gpio_pcal9535a_1_drvdata, &gpio_pcal9535a_1_cfg,
+			SECONDARY, CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_PCAL9535A_1 */
 
@@ -675,13 +671,11 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_2_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_2,
-			   CONFIG_GPIO_PCAL9535A_2_DEV_NAME,
-			   gpio_pcal9535a_init, &gpio_pcal9535a_2_cfg);
-
 /* This has to init after I2C master */
-DEVICE_DEFINE(gpio_pcal9535a_2, &gpio_pcal9535a_2_drvdata, SECONDARY,
-		  CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
+DEVICE_INIT(gpio_pcal9535a_2, CONFIG_GPIO_PCAL9535A_2_DEV_NAME,
+			gpio_pcal9535a_init,
+			&gpio_pcal9535a_2_drvdata, &gpio_pcal9535a_2_cfg,
+			SECONDARY, CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_PCAL9535A_2 */
 
@@ -704,12 +698,11 @@ static struct gpio_pcal9535a_drv_data gpio_pcal9535a_3_drvdata = {
 	.reg_cache.pud_sel = { .all = 0xFFFF },
 };
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_pcal9535a_3,
-			   CONFIG_GPIO_PCAL9535A_3_DEV_NAME,
-			   gpio_pcal9535a_init, &gpio_pcal9535a_3_cfg);
-
 /* This has to init after I2C master */
-DEVICE_DEFINE(gpio_pcal9535a_3, &gpio_pcal9535a_3_drvdata, SECONDARY,
-		  CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
+DEVICE_INIT(gpio_pcal9535a_3, CONFIG_GPIO_PCAL9535A_3_DEV_NAME,
+			gpio_pcal9535a_init,
+			&gpio_pcal9535a_3_drvdata, &gpio_pcal9535a_3_cfg,
+			SECONDARY, CONFIG_GPIO_PCAL9535A_INIT_PRIORITY);
+
 
 #endif /* CONFIG_GPIO_PCAL9535A_3 */
diff --git a/drivers/gpio/gpio_qmsi.c b/drivers/gpio/gpio_qmsi.c
index 6be27ad1d0e..4911392c433 100644
--- a/drivers/gpio/gpio_qmsi.c
+++ b/drivers/gpio/gpio_qmsi.c
@@ -277,8 +277,6 @@ static struct gpio_qmsi_config gpio_0_config = {
 
 static struct gpio_qmsi_runtime gpio_0_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_0, CONFIG_GPIO_QMSI_0_NAME,
-			   &gpio_qmsi_init, &gpio_0_config);
-
-DEVICE_DEFINE(gpio_0, &gpio_0_runtime, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(gpio_0, CONFIG_GPIO_QMSI_0_NAME, &gpio_qmsi_init,
+			&gpio_0_runtime, &gpio_0_config,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/gpio/gpio_sch.c b/drivers/gpio/gpio_sch.c
index 62751bc6ad7..7316e94b550 100644
--- a/drivers/gpio/gpio_sch.c
+++ b/drivers/gpio/gpio_sch.c
@@ -359,10 +359,9 @@ struct gpio_sch_config gpio_sch_0_config = {
 
 struct gpio_sch_data gpio_data_0;
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_0, CONFIG_GPIO_SCH_0_DEV_NAME,
-			   gpio_sch_init, &gpio_sch_0_config);
-DEVICE_DEFINE(gpio_0, &gpio_data_0, SECONDARY,
-		  CONFIG_GPIO_SCH_INIT_PRIORITY);
+DEVICE_INIT(gpio_0, CONFIG_GPIO_SCH_0_DEV_NAME, gpio_sch_init,
+				&gpio_data_0, &gpio_sch_0_config,
+				SECONDARY, CONFIG_GPIO_SCH_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_SCH_0 */
 #if CONFIG_GPIO_SCH_1
@@ -374,9 +373,8 @@ struct gpio_sch_config gpio_sch_1_config = {
 
 struct gpio_sch_data gpio_data_1;
 
-DEVICE_INIT_CONFIG_DEFINE(gpio_1, CONFIG_GPIO_SCH_1_DEV_NAME,
-			   gpio_sch_init, &gpio_sch_1_config);
-DEVICE_DEFINE(gpio_1, &gpio_data_1, SECONDARY,
-		  CONFIG_GPIO_SCH_INIT_PRIORITY);
+DEVICE_INIT(gpio_1, CONFIG_GPIO_SCH_1_DEV_NAME, gpio_sch_init,
+				&gpio_data_1, &gpio_sch_1_config,
+				SECONDARY, CONFIG_GPIO_SCH_INIT_PRIORITY);
 
 #endif /* CONFIG_GPIO_SCH_1 */
diff --git a/drivers/grove/lcd_rgb.c b/drivers/grove/lcd_rgb.c
index f68b5965251..58b86c52411 100644
--- a/drivers/grove/lcd_rgb.c
+++ b/drivers/grove/lcd_rgb.c
@@ -354,10 +354,6 @@ struct glcd_data grove_lcd_driver = {
 	.function = 0,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(grove_lcd,
-			   GROVE_LCD_NAME,
-			   glcd_initialize,
-			   &grove_lcd_config);
-
-DEVICE_DEFINE(grove_lcd, &grove_lcd_driver, NANOKERNEL,
-		  CONFIG_GROVE_LCD_RGB_INIT_PRIORITY);
+DEVICE_INIT(grove_lcd, GROVE_LCD_NAME, glcd_initialize,
+			&grove_lcd_driver, &grove_lcd_config,
+			NANOKERNEL, CONFIG_GROVE_LCD_RGB_INIT_PRIORITY);
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index d8b012433d1..43ff1125107 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -773,12 +773,9 @@ struct i2c_dw_dev_config i2c_0_runtime = {
 	.app_config.raw = CONFIG_I2C_DW_0_DEFAULT_CFG,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(i2c_0,
-			   CONFIG_I2C_DW_0_NAME,
-			   &i2c_dw_initialize,
-			   &i2c_config_dw_0);
-
-DEVICE_DEFINE(i2c_0, &i2c_0_runtime, SECONDARY, CONFIG_I2C_INIT_PRIORITY);
+DEVICE_INIT(i2c_0, CONFIG_I2C_DW_0_NAME, &i2c_dw_initialize,
+			&i2c_0_runtime, &i2c_config_dw_0,
+			SECONDARY, CONFIG_I2C_INIT_PRIORITY);
 
 void i2c_config_0(struct device *port)
 {
@@ -826,13 +823,9 @@ struct i2c_dw_dev_config i2c_1_runtime = {
 	.app_config.raw = CONFIG_I2C_DW_1_DEFAULT_CFG,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(i2c_1,
-			   CONFIG_I2C_DW_1_NAME,
-			   &i2c_dw_initialize,
-			   &i2c_config_dw_1);
-
-DEVICE_DEFINE(i2c_1, &i2c_1_runtime, SECONDARY,
-					CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(i2c_1, CONFIG_I2C_DW_1_NAME, &i2c_dw_initialize,
+			&i2c_1_runtime, &i2c_config_dw_1,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 void i2c_config_1(struct device *port)
 {
diff --git a/drivers/i2c/i2c_qmsi.c b/drivers/i2c/i2c_qmsi.c
index efd20a2555d..65931aaf767 100644
--- a/drivers/i2c/i2c_qmsi.c
+++ b/drivers/i2c/i2c_qmsi.c
@@ -115,7 +115,6 @@ static int i2c_qmsi_init(struct device *dev)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(i2c_qmsi_0, CONFIG_I2C_QMSI_0_NAME, i2c_qmsi_init,
-			   NULL);
-
-DEVICE_DEFINE(i2c_qmsi_0, 0, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(i2c_qmsi_0, CONFIG_I2C_QMSI_0_NAME, i2c_qmsi_init,
+			0, NULL,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/i2c/i2c_quark_se_ss.c b/drivers/i2c/i2c_quark_se_ss.c
index 24a7b303af8..944b9d006d3 100644
--- a/drivers/i2c/i2c_quark_se_ss.c
+++ b/drivers/i2c/i2c_quark_se_ss.c
@@ -657,13 +657,9 @@ struct i2c_qse_ss_dev_config i2c_ss_0_runtime = {
 	.app_config.raw = CONFIG_I2C_QUARK_SE_SS_0_DEFAULT_CFG,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(i2c_ss_0,
-			   CONFIG_I2C_QUARK_SE_SS_0_NAME,
-			   &i2c_qse_ss_initialize,
-			   &i2c_config_ss_0);
-
-DEVICE_DEFINE(i2c_ss_0, &i2c_ss_0_runtime,
-					SECONDARY, CONFIG_I2C_INIT_PRIORITY);
+DEVICE_INIT(i2c_ss_0, CONFIG_I2C_QUARK_SE_SS_0_NAME, &i2c_qse_ss_initialize,
+			&i2c_ss_0_runtime, &i2c_config_ss_0,
+			SECONDARY, CONFIG_I2C_INIT_PRIORITY);
 
 void _i2c_qse_ss_config_irq_0(struct device *port)
 {
@@ -722,13 +718,9 @@ struct i2c_qse_ss_dev_config i2c_qse_ss_1_runtime = {
 	.app_config.raw = CONFIG_I2C_QUARK_SE_SS_1_DEFAULT_CFG,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(i2c_ss_1,
-			   CONFIG_I2C_QUARK_SE_SS_1_NAME,
-			   &i2c_qse_ss_initialize,
-			   &i2c_config_ss_1);
-
-DEVICE_DEFINE(i2c_ss_1, &i2c_qse_ss_1_runtime,
-					SECONDARY, CONFIG_I2C_INIT_PRIORITY);
+DEVICE_INIT(i2c_ss_1, CONFIG_I2C_QUARK_SE_SS_1_NAME, &i2c_qse_ss_initialize,
+			&i2c_qse_ss_1_runtime, &i2c_config_ss_1,
+			SECONDARY, CONFIG_I2C_INIT_PRIORITY);
 
 
 void _i2c_qse_ss_config_irq_1(struct device *port)
diff --git a/drivers/interrupt_controller/i8259.c b/drivers/interrupt_controller/i8259.c
index 2a982a5ec2f..15bd18b48ee 100644
--- a/drivers/interrupt_controller/i8259.c
+++ b/drivers/interrupt_controller/i8259.c
@@ -62,6 +62,6 @@ int _i8259_init(struct device *unused)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(pic_0, "", _i8259_init, NULL);
-DEVICE_DEFINE(pic_0, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(pic_0, "", _i8259_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c
index f45987fd280..47a8fdf01f0 100644
--- a/drivers/interrupt_controller/ioapic_intr.c
+++ b/drivers/interrupt_controller/ioapic_intr.c
@@ -314,6 +314,6 @@ static void _IoApicRedUpdateLo(unsigned int irq,
 	ioApicRedSetLo(irq, (ioApicRedGetLo(irq) & ~mask) | (value & mask));
 }
 
-DEVICE_INIT_CONFIG_DEFINE(ioapic_0, "", _ioapic_init, NULL);
-DEVICE_DEFINE(ioapic_0, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(ioapic_0, "", _ioapic_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
index 439635c5b07..f5b4bd0ff93 100644
--- a/drivers/interrupt_controller/loapic_intr.c
+++ b/drivers/interrupt_controller/loapic_intr.c
@@ -444,9 +444,9 @@ int _loapic_isr_vector_get(void)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(loapic_0, "", _loapic_init, NULL);
-DEVICE_DEFINE(loapic_0, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(loapic_0, "", _loapic_init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 #if CONFIG_LOAPIC_SPURIOUS_VECTOR
 extern void _loapic_spurious_handler(void);
diff --git a/drivers/ipm/ipm_quark_se.h b/drivers/ipm/ipm_quark_se.h
index f0de7fb5e66..70e1748f9c0 100644
--- a/drivers/ipm/ipm_quark_se.h
+++ b/drivers/ipm/ipm_quark_se.h
@@ -137,11 +137,9 @@ int quark_se_ipm_controller_initialize(struct device *d);
 		.direction = dir \
 	}; \
 	struct quark_se_ipm_driver_data quark_se_ipm_runtime_##name; \
-	DEVICE_INIT_CONFIG_DEFINE(name, _STRINGIFY(name), \
-				   quark_se_ipm_initialize, \
-				   &quark_se_ipm_config_##name); \
-	DEVICE_DEFINE(name, &quark_se_ipm_runtime_##name, SECONDARY, \
-						CONFIG_KERNEL_INIT_PRIORITY_DEFAULT)
+	DEVICE_INIT(name, _STRINGIFY(name), quark_se_ipm_initialize, \
+				&quark_se_ipm_runtime_##name, &quark_se_ipm_config_##name, \
+				SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT)
 
 #ifdef __cplusplus
 }
diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c
index eb1e05bdb94..83f1e27c8a2 100644
--- a/drivers/pwm/pwm_dw.c
+++ b/drivers/pwm/pwm_dw.c
@@ -246,11 +246,8 @@ static struct pwm_dw_config pwm_dw_cfg = {
 	.num_ports = CONFIG_PWM_DW_NUM_PORTS,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(pwm_dw_0,
-			   CONFIG_PWM_DW_DEV_NAME,
-			   pwm_dw_init, &pwm_dw_cfg);
-
-DEVICE_DEFINE(pwm_dw_0, NULL, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(pwm_dw_0, CONFIG_PWM_DW_DEV_NAME, pwm_dw_init,
+			NULL, &pwm_dw_cfg,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_PWM_DW */
diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c
index ec9eabd1ae9..74b11382bb2 100644
--- a/drivers/pwm/pwm_pca9685.c
+++ b/drivers/pwm/pwm_pca9685.c
@@ -230,12 +230,10 @@ static struct pwm_pca9685_config pwm_pca9685_0_cfg = {
 
 static struct pwm_pca9685_drv_data pwm_pca9685_0_drvdata;
 
-DEVICE_INIT_CONFIG_DEFINE(pwm_pca9685_0,
-			   CONFIG_PWM_PCA9685_0_DEV_NAME,
-			   pwm_pca9685_init, &pwm_pca9685_0_cfg);
-
 /* This has to init after I2C master */
-DEVICE_DEFINE(pwm_pca9685_0, &pwm_pca9685_0_drvdata, SECONDARY,
-		  CONFIG_PWM_PCA9685_INIT_PRIORITY);
+DEVICE_INIT(pwm_pca9685_0, CONFIG_PWM_PCA9685_0_DEV_NAME,
+			pwm_pca9685_init,
+			&pwm_pca9685_0_drvdata, &pwm_pca9685_0_cfg,
+			SECONDARY, CONFIG_PWM_PCA9685_INIT_PRIORITY);
 
 #endif /* CONFIG_PWM_PCA9685_0 */
diff --git a/drivers/rtc/rtc_dw.c b/drivers/rtc/rtc_dw.c
index 9cdec8450f6..3c961b97bdd 100644
--- a/drivers/rtc/rtc_dw.c
+++ b/drivers/rtc/rtc_dw.c
@@ -200,11 +200,9 @@ struct rtc_dw_dev_config rtc_dev = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(rtc, CONFIG_RTC_DRV_NAME,
-			   &rtc_dw_init, &rtc_dev);
-
-DEVICE_DEFINE(rtc, &rtc_runtime, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(rtc, CONFIG_RTC_DRV_NAME, &rtc_dw_init,
+			&rtc_runtime, &rtc_dev,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 int rtc_dw_init(struct device *dev)
 {
diff --git a/drivers/rtc/rtc_qmsi.c b/drivers/rtc/rtc_qmsi.c
index 53cf768a69f..9865112cc62 100644
--- a/drivers/rtc/rtc_qmsi.c
+++ b/drivers/rtc/rtc_qmsi.c
@@ -92,10 +92,8 @@ static int rtc_qmsi_init(struct device *dev)
 	return DEV_OK;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(rtc, CONFIG_RTC_DRV_NAME,
-			   &rtc_qmsi_init, NULL);
-
-DEVICE_DEFINE(rtc, NULL, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(rtc, CONFIG_RTC_DRV_NAME, &rtc_qmsi_init,
+			NULL, NULL,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 static struct device *rtc_qmsi_dev = DEVICE_GET(rtc);
diff --git a/drivers/serial/uart_atmel_sam3.c b/drivers/serial/uart_atmel_sam3.c
index 4658a578d84..8bd942e42b5 100644
--- a/drivers/serial/uart_atmel_sam3.c
+++ b/drivers/serial/uart_atmel_sam3.c
@@ -259,10 +259,6 @@ static struct uart_sam3_dev_data_t uart_sam3_dev_data_0 = {
 	.baud_rate = CONFIG_UART_ATMEL_SAM3_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_sam3_0,
-			   CONFIG_UART_ATMEL_SAM3_NAME,
-			   &uart_sam3_init,
-			   &uart_sam3_dev_cfg_0);
-
-DEVICE_DEFINE(uart_sam3_0, &uart_sam3_dev_data_0,
-		  PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_sam3_0, CONFIG_UART_ATMEL_SAM3_NAME, &uart_sam3_init,
+			&uart_sam3_dev_data_0, &uart_sam3_dev_cfg_0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/serial/uart_k20.c b/drivers/serial/uart_k20.c
index 4f688e6fdfa..3f0985e4558 100644
--- a/drivers/serial/uart_k20.c
+++ b/drivers/serial/uart_k20.c
@@ -376,13 +376,9 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_0 = {
 	.baud_rate = CONFIG_UART_K20_PORT_0_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_k20_0,
-			   CONFIG_UART_K20_PORT_0_NAME,
-			   &uart_k20_init,
-			   &uart_k20_dev_cfg_0);
-
-DEVICE_DEFINE(uart_k20_0, &uart_k20_dev_data_0, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_k20_0, CONFIG_UART_K20_PORT_0_NAME, &uart_k20_init,
+			&uart_k20_dev_data_0, &uart_k20_dev_cfg_0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_K20_PORT_0 */
 
@@ -397,13 +393,9 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_1 = {
 	.baud_rate = CONFIG_UART_K20_PORT_1_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_k20_1,
-			   CONFIG_UART_K20_PORT_1_NAME,
-			   &uart_k20_init,
-			   &uart_k20_dev_cfg_1);
-
-DEVICE_DEFINE(uart_k20_1, &uart_k20_dev_data_1, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_k20_1, CONFIG_UART_K20_PORT_1_NAME, &uart_k20_init,
+			&uart_k20_dev_data_1, &uart_k20_dev_cfg_1,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_K20_PORT_1 */
 
@@ -418,13 +410,9 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_2 = {
 	.baud_rate = CONFIG_UART_K20_PORT_2_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_k20_2,
-			   CONFIG_UART_K20_PORT_2_NAME,
-			   &uart_k20_init,
-			   &uart_k20_dev_cfg_2);
-
-DEVICE_DEFINE(uart_k20_2, &uart_k20_dev_data_2, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_k20_2, CONFIG_UART_K20_PORT_2_NAME, &uart_k20_init,
+			&uart_k20_dev_data_2, &uart_k20_dev_cfg_2,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_K20_PORT_2 */
 
@@ -439,13 +427,9 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_3 = {
 	.baud_rate = CONFIG_UART_K20_PORT_3_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_k20_3,
-			   CONFIG_UART_K20_PORT_3_NAME,
-			   &uart_k20_init,
-			   &uart_k20_dev_cfg_3);
-
-DEVICE_DEFINE(uart_k20_3, &uart_k20_dev_data_3, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_k20_3, CONFIG_UART_K20_PORT_3_NAME, &uart_k20_init,
+			&uart_k20_dev_data_3, &uart_k20_dev_cfg_3,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_K20_PORT_3 */
 
@@ -460,12 +444,8 @@ static struct uart_k20_dev_data_t uart_k20_dev_data_4 = {
 	.baud_rate = CONFIG_UART_K20_PORT_4_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_k20_4,
-			   CONFIG_UART_K20_PORT_4_NAME,
-			   &uart_k20_init,
-			   &uart_k20_dev_cfg_4);
-
-DEVICE_DEFINE(uart_k20_4, &uart_k20_dev_data_4, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_k20_4, CONFIG_UART_K20_PORT_4_NAME, &uart_k20_init,
+			&uart_k20_dev_data_4, &uart_k20_dev_cfg_4,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_K20_PORT_4 */
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index 3c8896e04ef..dba0ae65cac 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -702,13 +702,9 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_0 = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_0,
-			   CONFIG_UART_NS16550_PORT_0_NAME,
-			   &uart_ns16550_init,
-			   &uart_ns16550_dev_cfg_0);
-
-DEVICE_DEFINE(uart_ns16550_0, &uart_ns16550_dev_data_0,
-		  PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_ns16550_0, CONFIG_UART_NS16550_PORT_0_NAME, &uart_ns16550_init,
+			&uart_ns16550_dev_data_0, &uart_ns16550_dev_cfg_0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_NS16550_PORT_0 */
 
@@ -738,12 +734,8 @@ static struct uart_ns16550_dev_data_t uart_ns16550_dev_data_1 = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_ns16550_1,
-			   CONFIG_UART_NS16550_PORT_1_NAME,
-			   &uart_ns16550_init,
-			   &uart_ns16550_dev_cfg_1);
-
-DEVICE_DEFINE(uart_ns16550_1, &uart_ns16550_dev_data_1,
-		  PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_ns16550_1, CONFIG_UART_NS16550_PORT_1_NAME, &uart_ns16550_init,
+			&uart_ns16550_dev_data_1, &uart_ns16550_dev_cfg_1,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_NS16550_PORT_1 */
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index 944d51ce188..9b4e85e83d5 100644
--- a/drivers/serial/uart_nsim.c
+++ b/drivers/serial/uart_nsim.c
@@ -83,10 +83,6 @@ static struct uart_device_config uart_nsim_dev_cfg_0 = {
 	.regs = CONFIG_UART_NSIM_PORT_0_BASE_ADDR,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_nsim0,
-			   CONFIG_UART_NSIM_PORT_0_NAME,
-			   &uart_nsim_init,
-			   &uart_nsim_dev_cfg_0);
-
-DEVICE_DEFINE(uart_nsim0, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_nsim0, CONFIG_UART_NSIM_PORT_0_NAME, &uart_nsim_init,
+			NULL, &uart_nsim_dev_cfg_0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 91628940b33..3a6ea16ee31 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -602,13 +602,9 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_0 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_0_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_stellaris0,
-			   CONFIG_UART_STELLARIS_PORT_0_NAME,
-			   &uart_stellaris_init,
-			   &uart_stellaris_dev_cfg_0);
-
-DEVICE_DEFINE(uart_stellaris0, &uart_stellaris_dev_data_0, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_stellaris0, CONFIG_UART_STELLARIS_PORT_0_NAME, &uart_stellaris_init,
+			&uart_stellaris_dev_data_0, &uart_stellaris_dev_cfg_0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_STELLARIS_PORT_0 */
 
@@ -623,13 +619,9 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_1 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_1_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_stellaris1,
-			   CONFIG_UART_STELLARIS_PORT_1_NAME,
-			   &uart_stellaris_init,
-			   &uart_stellaris_dev_cfg_1);
-
-DEVICE_DEFINE(uart_stellaris1, &uart_stellaris_dev_data_1, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_stellaris1, CONFIG_UART_STELLARIS_PORT_1_NAME, &uart_stellaris_init,
+			&uart_stellaris_dev_data_1, &uart_stellaris_dev_cfg_1,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_STELLARIS_PORT_1 */
 
@@ -644,12 +636,8 @@ static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_2 = {
 	.baud_rate = CONFIG_UART_STELLARIS_PORT_2_BAUD_RATE,
 };
 
-DEVICE_INIT_CONFIG_DEFINE(uart_stellaris2,
-			   CONFIG_UART_STELLARIS_PORT_2_NAME,
-			   &uart_stellaris_init,
-			   &uart_stellaris_dev_cfg_2);
-
-DEVICE_DEFINE(uart_stellaris2, &uart_stellaris_dev_data_2, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(uart_stellaris2, CONFIG_UART_STELLARIS_PORT_2_NAME, &uart_stellaris_init,
+			&uart_stellaris_dev_data_2, &uart_stellaris_dev_cfg_2,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #endif /* CONFIG_UART_STELLARIS_PORT_2 */
diff --git a/drivers/shared_irq/shared_irq.c b/drivers/shared_irq/shared_irq.c
index 195855013a5..0847e170c14 100644
--- a/drivers/shared_irq/shared_irq.c
+++ b/drivers/shared_irq/shared_irq.c
@@ -144,10 +144,9 @@ struct shared_irq_config shared_irq_config_0 = {
 
 struct shared_irq_runtime shared_irq_0_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(shared_irq_0, CONFIG_SHARED_IRQ_0_NAME,
-			   shared_irq_initialize, &shared_irq_config_0);
-DEVICE_DEFINE(shared_irq_0, &shared_irq_0_runtime, SECONDARY,
-		  CONFIG_SHARED_IRQ_INIT_PRIORITY);
+DEVICE_INIT(shared_irq_0, CONFIG_SHARED_IRQ_0_NAME, shared_irq_initialize,
+				&shared_irq_0_runtime, &shared_irq_config_0,
+				SECONDARY, CONFIG_SHARED_IRQ_INIT_PRIORITY);
 
 #if defined(CONFIG_IOAPIC)
 #if defined(CONFIG_SHARED_IRQ_0)
@@ -185,10 +184,9 @@ struct shared_irq_config shared_irq_config_1 = {
 
 struct shared_irq_runtime shared_irq_1_runtime;
 
-DEVICE_INIT_CONFIG_DEFINE(shared_irq_1, CONFIG_SHARED_IRQ_1_NAME,
-			   shared_irq_initialize, &shared_irq_config_1);
-DEVICE_DEFINE(shared_irq_1, &shared_irq_1_runtime, SECONDARY,
-		  CONFIG_SHARED_IRQ_INIT_PRIORITY);
+DEVICE_INIT(shared_irq_1, CONFIG_SHARED_IRQ_1_NAME, shared_irq_initialize,
+				&shared_irq_1_runtime, &shared_irq_config_1,
+				SECONDARY, CONFIG_SHARED_IRQ_INIT_PRIORITY);
 
 #if defined(CONFIG_IOAPIC)
 #if defined(CONFIG_SHARED_IRQ_1)
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 3e8f468f791..7809b7fc1fb 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -582,11 +582,9 @@ struct spi_dw_config spi_dw_config_0 = {
 	.config_func = spi_config_0_irq
 };
 
-DEVICE_INIT_CONFIG_DEFINE(spi_dw_port_0, CONFIG_SPI_DW_PORT_0_DRV_NAME,
-			   spi_dw_init, &spi_dw_config_0);
-
-DEVICE_DEFINE(spi_dw_port_0, &spi_dw_data_port_0, SECONDARY,
-		  CONFIG_SPI_DW_INIT_PRIORITY);
+DEVICE_INIT(spi_dw_port_0, CONFIG_SPI_DW_PORT_0_DRV_NAME, spi_dw_init,
+			&spi_dw_data_port_0, &spi_dw_config_0,
+			SECONDARY, CONFIG_SPI_DW_INIT_PRIORITY);
 
 void spi_config_0_irq(void)
 {
@@ -615,11 +613,9 @@ struct spi_dw_config spi_dw_config_1 = {
 	.config_func = spi_config_1_irq
 };
 
-DEVICE_INIT_CONFIG_DEFINE(spi_dw_port_1, CONFIG_SPI_DW_PORT_1_DRV_NAME,
-			   spi_dw_init, &spi_dw_config_1);
-
-DEVICE_DEFINE(spi_dw_port_1, &spi_dw_data_port_1, SECONDARY,
-		  CONFIG_SPI_DW_INIT_PRIORITY);
+DEVICE_INIT(spi_dw_port_1, CONFIG_SPI_DW_PORT_1_DRV_NAME, spi_dw_init,
+			&spi_dw_data_port_1, &spi_dw_config_1,
+			SECONDARY, CONFIG_SPI_DW_INIT_PRIORITY);
 
 void spi_config_1_irq(void)
 {
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
index ddcb67d09ee..fac41f28b2b 100644
--- a/drivers/spi/spi_intel.c
+++ b/drivers/spi/spi_intel.c
@@ -467,12 +467,10 @@ struct spi_intel_config spi_intel_config_0 = {
 	.config_func = spi_config_0_irq
 };
 
-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 */
-DEVICE_DEFINE(spi_intel_port_0, &spi_intel_data_port_0, SECONDARY,
-		  CONFIG_SPI_INTEL_INIT_PRIORITY);
+DEVICE_INIT(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME, spi_intel_init,
+			&spi_intel_data_port_0, &spi_intel_config_0,
+			SECONDARY, CONFIG_SPI_INTEL_INIT_PRIORITY);
 
 void spi_config_0_irq(void)
 {
@@ -506,12 +504,10 @@ struct spi_intel_config spi_intel_config_1 = {
 	.config_func = spi_config_1_irq
 };
 
-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 */
-DEVICE_DEFINE(spi_intel_port_1, &spi_intel_data_port_1, SECONDARY,
-		  CONFIG_SPI_INTEL_INIT_PRIORITY);
+DEVICE_INIT(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME, spi_intel_init,
+			&spi_intel_data_port_1, &spi_intel_config_1,
+			SECONDARY, CONFIG_SPI_INTEL_INIT_PRIORITY);
 
 void spi_config_1_irq(void);
 {
diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c
index ffb51f46ab8..4703da29ed4 100644
--- a/drivers/timer/sys_clock_init.c
+++ b/drivers/timer/sys_clock_init.c
@@ -32,8 +32,6 @@
 #include <init.h>
 #include <drivers/system_timer.h>
 
-DEVICE_INIT_CONFIG_DEFINE(sys_clock, "sys_clock",
-			   _sys_clock_driver_init, NULL);
-
-DEVICE_DEFINE(sys_clock, NULL, NANOKERNEL,
-		  CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
+DEVICE_INIT(sys_clock, "sys_clock", _sys_clock_driver_init,
+			NULL, NULL,
+			NANOKERNEL, CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
diff --git a/drivers/watchdog/wdt_dw.c b/drivers/watchdog/wdt_dw.c
index cf1c8287d1a..32884f135cd 100644
--- a/drivers/watchdog/wdt_dw.c
+++ b/drivers/watchdog/wdt_dw.c
@@ -160,11 +160,9 @@ struct wdt_dw_dev_config wdt_dev = {
 #endif
 };
 
-DEVICE_INIT_CONFIG_DEFINE(wdt, CONFIG_WDT_DW_DRV_NAME,
-			   &wdt_dw_init, &wdt_dev);
-
-DEVICE_DEFINE(wdt, &wdt_runtime, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(wdt, CONFIG_WDT_DW_DRV_NAME, &wdt_dw_init,
+			&wdt_runtime, &wdt_dev,
+			SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 int wdt_dw_init(struct device *dev)
 {
diff --git a/drivers/watchdog/wdt_qmsi.c b/drivers/watchdog/wdt_qmsi.c
index 79e4cd26811..57f6c2cb63c 100644
--- a/drivers/watchdog/wdt_qmsi.c
+++ b/drivers/watchdog/wdt_qmsi.c
@@ -98,9 +98,9 @@ static int init(struct device *dev)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(wdt, CONFIG_WDT_QMSI_DRV_NAME, init, 0);
-
-DEVICE_DEFINE(wdt, 0, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
+DEVICE_INIT(wdt, CONFIG_WDT_QMSI_DRV_NAME, init,
+			0, 0,
+			PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 /* Define 'struct device' variable which is passed to the ISR. Even if it
  * is not used by the ISR code, we require it in order to be able to pass
diff --git a/kernel/nanokernel/kernel_event_logger.c b/kernel/nanokernel/kernel_event_logger.c
index d54f7478125..4c66744d8e0 100644
--- a/kernel/nanokernel/kernel_event_logger.c
+++ b/kernel/nanokernel/kernel_event_logger.c
@@ -53,10 +53,9 @@ static int _sys_k_event_logger_init(struct device *arg)
 
 	return 0;
 }
-DEVICE_INIT_CONFIG_DEFINE(kernel_event_logger_0, "",
-	_sys_k_event_logger_init, NULL);
-DEVICE_DEFINE(kernel_event_logger_0, NULL, NANOKERNEL,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(kernel_event_logger_0, "", _sys_k_event_logger_init,
+				NULL, NULL,
+				NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 
 void sys_k_event_logger_put_timed(uint16_t event_id)
diff --git a/misc/debug/mem_safe_check_boundaries.c b/misc/debug/mem_safe_check_boundaries.c
index c5dce5f974a..0615eed9fad 100644
--- a/misc/debug/mem_safe_check_boundaries.c
+++ b/misc/debug/mem_safe_check_boundaries.c
@@ -290,6 +290,6 @@ static int init(struct device *unused)
 	return 0;
 }
 
-DEVICE_INIT_CONFIG_DEFINE(mem_safe, "", init, NULL);
-DEVICE_DEFINE(mem_safe, NULL, PRIMARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(mem_safe, "", init,
+				NULL, NULL,
+				PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/samples/nanokernel/test/test_ipm/src/test_ipm.c b/samples/nanokernel/test/test_ipm/src/test_ipm.c
index 4d338282606..814d78e10ee 100644
--- a/samples/nanokernel/test/test_ipm/src/test_ipm.c
+++ b/samples/nanokernel/test/test_ipm/src/test_ipm.c
@@ -40,9 +40,9 @@
 
 /* Set up the dummy IPM driver */
 struct ipm_dummy_driver_data ipm_dummy0_driver_data;
-DEVICE_INIT_CONFIG_DEFINE(ipm_dummy0, "ipm_dummy0", ipm_dummy_init, NULL);
-DEVICE_DEFINE(ipm_dummy0, &ipm_dummy0_driver_data, SECONDARY,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(ipm_dummy0, "ipm_dummy0", ipm_dummy_init,
+				&ipm_dummy0_driver_data, NULL,
+				SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 /* Sending side of the console IPM driver, will forward anything sent
  * to printf() since we selected IPM_CONSOLE_STDOUT
@@ -51,10 +51,9 @@ struct ipm_console_sender_config_info sender_config = {
 	.bind_to = "ipm_dummy0",
 	.flags = SOURCE
 };
-DEVICE_INIT_CONFIG_DEFINE(ipm_console_send0, "ipm_send0",
-			   ipm_console_sender_init, &sender_config);
-DEVICE_DEFINE(ipm_console_send0, NULL, NANOKERNEL,
-		  INIT_PRIO_IPM_SEND);
+DEVICE_INIT(ipm_console_send0, "ipm_send0", ipm_console_sender_init,
+				NULL, &sender_config,
+				NANOKERNEL, INIT_PRIO_IPM_SEND);
 
 /* Receiving side of the console IPM driver. These numbers are
  * more or less arbitrary
@@ -78,10 +77,9 @@ struct ipm_console_receiver_config_info receiver_config = {
 };
 
 struct ipm_console_receiver_runtime_data receiver_data;
-DEVICE_INIT_CONFIG_DEFINE(ipm_console_recv0, "ipm_recv0",
-			   ipm_console_receiver_init, &receiver_config);
-DEVICE_DEFINE(ipm_console_recv0, &receiver_data, NANOKERNEL,
-		  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+DEVICE_INIT(ipm_console_recv0, "ipm_recv0", ipm_console_receiver_init,
+				&receiver_data, &receiver_config,
+				NANOKERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 
 static const char thestr[] = "everything is awesome\n";