subsys: Switching DEVICE_<DT/DT_INST>_DEFINE macros to new ones

tbursztyka · tbursztyka · commit 394c058b5df1 · 2024-11-26T19:27:33.000+01:00
Switching to DEVICE_INSTANCE and DEVICE_INSTANCE_FROM_DT_INST, thus
merging former DEVICE_DEFINE and DEVICE_DT_DEFINE into one, so removing
the name parameter from the earier and finally removing the prio
parameter on all.

Signed-off-by: Tomasz Bursztyka &lt;tomasz.bursztyka@proton.me&gt;
diff --git a/samples/subsys/pm/device_pm/src/dummy_driver.c b/samples/subsys/pm/device_pm/src/dummy_driver.c
@@ -114,6 +114,6 @@ int dummy_init(const struct device *dev)
 
 PM_DEVICE_DEFINE(dummy_driver, dummy_device_pm_action);
 
-DEVICE_DEFINE(dummy_driver, DUMMY_DRIVER_NAME, &dummy_init,
+DEVICE_INSTANCE(dummy_driver, &dummy_init,
 		    PM_DEVICE_GET(dummy_driver), NULL, NULL, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &funcs);
+		    &funcs);
diff --git a/samples/subsys/pm/device_pm/src/dummy_parent.c b/samples/subsys/pm/device_pm/src/dummy_parent.c
@@ -51,6 +51,6 @@ int dummy_parent_init(const struct device *dev)
 
 PM_DEVICE_DEFINE(dummy_parent, dummy_parent_pm_action);
 
-DEVICE_DEFINE(dummy_parent, DUMMY_PARENT_NAME, &dummy_parent_init,
+DEVICE_INSTANCE(dummy_parent, &dummy_parent_init,
 		    PM_DEVICE_GET(dummy_parent), NULL, NULL, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs);
+		    &funcs);
diff --git a/samples/subsys/pm/latency/src/test.c b/samples/subsys/pm/latency/src/test.c
@@ -59,5 +59,5 @@ int dev_test_init(const struct device *dev)
 
 static struct dev_test_data data;
 
-DEVICE_DEFINE(dev_test, "dev_test", &dev_test_init, NULL, &data, NULL,
-	      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &dev_test_api);
+DEVICE_INSTANCE(dev_test, &dev_test_init, NULL, &data, NULL,
+	      POST_KERNEL, &dev_test_api);
diff --git a/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c b/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c
@@ -145,8 +145,8 @@ static const struct rtio_iodev_api vnd_sensor_iodev_api = {
 			},                                                                         \
 	};                                                                                         \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(n, vnd_sensor_init, NULL, &vnd_sensor_data_##n,                      \
+	DEVICE_INSTANCE_FROM_DT_INST(n, vnd_sensor_init, NULL, &vnd_sensor_data_##n,               \
 			      &vnd_sensor_config_##n, POST_KERNEL,                                 \
-			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, NULL);
+			      NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(VND_SENSOR_INIT)
diff --git a/samples/userspace/prod_consumer/src/sample_driver_foo.c b/samples/userspace/prod_consumer/src/sample_driver_foo.c
@@ -108,8 +108,6 @@ static int sample_driver_foo_init(const struct device *dev)
 
 static struct sample_driver_foo_dev_data sample_driver_foo_dev_data_0;
 
-DEVICE_DEFINE(sample_driver_foo_0, SAMPLE_DRIVER_NAME_0,
-		    &sample_driver_foo_init, NULL,
+DEVICE_INSTANCE(sample_driver_foo_0, &sample_driver_foo_init, NULL,
 		    &sample_driver_foo_dev_data_0, NULL,
-		    POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
-		    &sample_driver_foo_api);
+		    POST_KERNEL, &sample_driver_foo_api);
diff --git a/subsys/bluetooth/controller/coex/coex_ticker.c b/subsys/bluetooth/controller/coex/coex_ticker.c
@@ -202,5 +202,5 @@ static struct coex_ticker_config config = {
 };
 static struct coex_ticker_data data;
 
-DEVICE_DT_INST_DEFINE(0, &coex_ticker_init, NULL, &data, &config,
-		      POST_KERNEL, 90, NULL);
+DEVICE_INSTANCE_FROM_DT_INST(0, &coex_ticker_init, NULL, &data, &config,
+		      POST_KERNEL, NULL);
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -908,8 +908,8 @@ static const struct bt_hci_driver_api hci_driver_api = {
 
 #define BT_HCI_CONTROLLER_INIT(inst) \
 	static struct hci_driver_data data_##inst; \
-	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &data_##inst, NULL, POST_KERNEL, \
-			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &hci_driver_api)
+	DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &data_##inst, NULL, POST_KERNEL,\
+			      &hci_driver_api)
 
 /* Only a single instance is supported */
 BT_HCI_CONTROLLER_INIT(0)
diff --git a/subsys/input/input_double_tap.c b/subsys/input/input_double_tap.c
@@ -119,7 +119,7 @@ static int double_tap_init(const struct device *dev)
 		.double_tap_delay_ms = DT_INST_PROP(inst, double_tap_delay_ms),                    \
 	};                                                                                         \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(inst, double_tap_init, NULL, NULL, &double_tap_config_##inst,        \
-			      POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+	DEVICE_INSTANCE_FROM_DT_INST(inst, double_tap_init, NULL, NULL, &double_tap_config_##inst, \
+			      POST_KERNEL, NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(INPUT_DOUBLE_TAP_DEFINE)
diff --git a/subsys/input/input_keymap.c b/subsys/input/input_keymap.c
@@ -118,8 +118,8 @@ static int keymap_init(const struct device *dev)
 												\
 	static struct keymap_data keymap_data_##inst;						\
 												\
-	DEVICE_DT_INST_DEFINE(inst, keymap_init, NULL,						\
+	DEVICE_INSTANCE_FROM_DT_INST(inst, keymap_init, NULL,					\
 			      &keymap_data_##inst, &keymap_config_##inst,			\
-			      POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+			      POST_KERNEL, NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(INPUT_KEYMAP_DEFINE)
diff --git a/subsys/input/input_longpress.c b/subsys/input/input_longpress.c
@@ -136,8 +136,8 @@ static int longpress_init(const struct device *dev)
 		.long_delays_ms = DT_INST_PROP(inst, long_delay_ms),                               \
 	};                                                                                         \
 	                                                                                           \
-	DEVICE_DT_INST_DEFINE(inst, longpress_init, NULL,                                          \
+	DEVICE_INSTANCE_FROM_DT_INST(inst, longpress_init, NULL,                                   \
 			      NULL, &longpress_config_##inst,                                      \
-			      POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);
+			      POST_KERNEL, NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(INPUT_LONGPRESS_DEFINE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -1450,13 +1450,12 @@ const static struct ipc_service_backend backend_ops = {
 		     "RX region is too small for provided number of blocks");		\
 	BUILD_ASSERT(DT_INST_PROP(i, rx_blocks) <= 256, "Too many RX blocks");		\
 	BUILD_ASSERT(DT_INST_PROP(i, tx_blocks) <= 256, "Too many TX blocks");		\
-	DEVICE_DT_INST_DEFINE(i,							\
+	DEVICE_INSTANCE_FROM_DT_INST(i,							\
 			      &backend_init,						\
 			      NULL,							\
 			      &backend_data_##i,					\
 			      &backend_config_##i,					\
 			      POST_KERNEL,						\
-			      CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,			\
 			      &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg.c b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
@@ -74,13 +74,12 @@ static int backend_init(const struct device *instance)
 		.rx_pb = &rx_pb_##i,					\
 	};								\
 									\
-	DEVICE_DT_INST_DEFINE(i,					\
+	DEVICE_INSTANCE_FROM_DT_INST(i,					\
 			 &backend_init,					\
 			 NULL,						\
 			 &backend_data_##i,				\
 			 &backend_config_##i,				\
 			 POST_KERNEL,					\
-			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,	\
 			 &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_follower.c
@@ -300,13 +300,12 @@ static int backend_init(const struct device *instance)
 		}								\
 	};									\
 										\
-	DEVICE_DT_INST_DEFINE(i,						\
+	DEVICE_INSTANCE_FROM_DT_INST(i,						\
 			 &backend_init,						\
 			 NULL,							\
 			 &backend_data_##i,					\
 			 &backend_config_##i,					\
 			 POST_KERNEL,						\
-			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,		\
 			 &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c b/subsys/ipc/ipc_service/backends/ipc_icmsg_me_initiator.c
@@ -206,13 +206,12 @@ static int backend_init(const struct device *instance)
 		}								\
 	};									\
 										\
-	DEVICE_DT_INST_DEFINE(i,						\
+	DEVICE_INSTANCE_FROM_DT_INST(i,						\
 			 &backend_init,						\
 			 NULL,							\
 			 &backend_data_##i,					\
 			 &backend_config_##i,					\
 			 POST_KERNEL,						\
-			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,		\
 			 &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -826,13 +826,12 @@ static int backend_init(const struct device *instance)
 											\
 	static struct backend_data_t backend_data_##i;					\
 											\
-	DEVICE_DT_INST_DEFINE(i,							\
+	DEVICE_INSTANCE_FROM_DT_INST(i,							\
 			 &backend_init,							\
 			 NULL,								\
 			 &backend_data_##i,						\
 			 &backend_config_##i,						\
 			 POST_KERNEL,							\
-			 CONFIG_IPC_SERVICE_REG_BACKEND_PRIORITY,			\
 			 &backend_ops);
 
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_BACKEND_DEVICE)
diff --git a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_ite.c b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_ite.c
@@ -547,8 +547,8 @@ static struct shi_it8xxx2_data shi_data = {
 	.shi_state = SHI_STATE_DISABLED,
 };
 
-DEVICE_DT_INST_DEFINE(0, shi_ite_init, PM_DEVICE_DT_INST_GET(0), &shi_data, &shi_cfg, POST_KERNEL,
-		      CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &ec_host_cmd_api);
+DEVICE_INSTANCE_FROM_DT_INST(0, shi_ite_init, PM_DEVICE_DT_INST_GET(0), &shi_data, &shi_cfg, POST_KERNEL,
+		      &ec_host_cmd_api);
 
 EC_HOST_CMD_SHI_ITE_DEFINE(ec_host_cmd_shi_ite);
 
diff --git a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c
@@ -1144,8 +1144,8 @@ static struct shi_npcx_data shi_data = {
 	.out_msg = shi_data.out_msg_padded + SHI_OUT_START_PAD - EC_SHI_FRAME_START_LENGTH,
 };
 
-DEVICE_DT_INST_DEFINE(0, shi_npcx_init, PM_DEVICE_DT_INST_GET(0), &shi_data, &shi_cfg, POST_KERNEL,
-		      CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &ec_host_cmd_api);
+DEVICE_INSTANCE_FROM_DT_INST(0, shi_npcx_init, PM_DEVICE_DT_INST_GET(0), &shi_data, &shi_cfg, POST_KERNEL,
+		      &ec_host_cmd_api);
 
 EC_HOST_CMD_SHI_NPCX_DEFINE(ec_host_cmd_shi_npcx);
 
diff --git a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_spi_stm32.c b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_spi_stm32.c
@@ -848,11 +848,11 @@ static int ec_host_cmd_spi_stm32_pm_action(const struct device *dev,
 
 PM_DEVICE_DT_DEFINE(DT_CHOSEN(zephyr_host_cmd_spi_backend), ec_host_cmd_spi_stm32_pm_action);
 
-DEVICE_DT_DEFINE(DT_CHOSEN(zephyr_host_cmd_spi_backend),
+DEVICE_INSTANCE(DT_CHOSEN(zephyr_host_cmd_spi_backend),
 		 NULL,
 		 PM_DEVICE_DT_GET(DT_CHOSEN(zephyr_host_cmd_spi_backend)),
 		 &ec_host_cmd_spi, NULL,
-		 PRE_KERNEL_1, CONFIG_EC_HOST_CMD_INIT_PRIORITY, NULL);
+		 PRE_KERNEL_1, NULL);
 
 #ifdef CONFIG_EC_HOST_CMD_INITIALIZE_AT_BOOT
 static int host_cmd_init(void)
diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c
@@ -727,14 +727,12 @@ static const struct net_capture_interface_api capture_interface_api = {
 	static struct net_capture capture_dev_data_##x
 
 #define DEFINE_NET_CAPTURE_DEVICE(x, _)					\
-	DEVICE_DEFINE(net_capture_##x,					\
-		      "NET_CAPTURE" #x,					\
+	DEVICE_INSTANCE(net_capture_##x,				\
 		      &capture_dev_init,				\
 		      NULL,						\
 		      &capture_dev_data_##x,				\
 		      NULL,						\
 		      POST_KERNEL,					\
-		      CONFIG_KERNEL_INIT_PRIORITY_DEVICE,		\
 		      &capture_interface_api)
 
 LISTIFY(CONFIG_NET_CAPTURE_DEVICE_COUNT, DEFINE_NET_CAPTURE_DEV_DATA, (;), _);
diff --git a/subsys/retention/retention.c b/subsys/retention/retention.c
@@ -418,13 +418,12 @@ static const struct retention_api retention_api = {
 					  (DT_INST_PROP_LEN(inst, prefix)), (0)),		\
 		.prefix = DT_INST_PROP_OR(inst, prefix, {0}),					\
 	};											\
-	DEVICE_DT_INST_DEFINE(inst,								\
+	DEVICE_INSTANCE_FROM_DT_INST(inst,							\
 			      &retention_init,							\
 			      NULL,								\
 			      &retention_data_##inst,						\
 			      &retention_config_##inst,						\
 			      POST_KERNEL,							\
-			      CONFIG_RETENTION_INIT_PRIORITY,					\
 			      &retention_api);
 
 DT_INST_FOREACH_STATUS_OKAY(RETENTION_DEVICE)
diff --git a/subsys/sensing/sensor_mgmt.c b/subsys/sensing/sensor_mgmt.c
@@ -517,5 +517,5 @@ int sensing_get_sensors(int *sensor_nums, const struct sensing_sensor_info **inf
 K_THREAD_DEFINE(sensing_runtime, CONFIG_SENSING_RUNTIME_THREAD_STACK_SIZE, sensing_runtime_thread,
 		&sensing_ctx, NULL, NULL, CONFIG_SENSING_RUNTIME_THREAD_PRIORITY, 0, 0);
 
-DEVICE_DT_INST_DEFINE(0, sensing_init, NULL, &sensing_ctx, NULL, POST_KERNEL,
-		      CONFIG_SENSOR_INIT_PRIORITY, NULL);
+DEVICE_INSTANCE_FROM_DT_INST(0, sensing_init, NULL, &sensing_ctx, NULL, POST_KERNEL,
+		      NULL);
diff --git a/subsys/testsuite/busy_sim/busy_sim.c b/subsys/testsuite/busy_sim/busy_sim.c
@@ -208,7 +208,6 @@ static int busy_sim_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_DT_DEFINE(DT_BUSY_SIM, busy_sim_init, NULL,
+DEVICE_INSTANCE(DT_BUSY_SIM, busy_sim_init, NULL,
 	      &sim_data, &sim_config,
-	      POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY,
-	      NULL);
+	      POST_KERNEL, NULL);
diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c
@@ -1221,9 +1221,8 @@ static const struct uart_driver_api cdc_acm_driver_api = {
 		     " is not assigned to a USB device controller");	\
 	CDC_ACM_CFG_AND_DATA_DEFINE(idx)				\
 									\
-	DEVICE_DT_INST_DEFINE(idx, cdc_acm_init, NULL,			\
+	DEVICE_INSTANCE_FROM_DT_INST(idx, cdc_acm_init, NULL,		\
 		&cdc_acm_dev_data_##idx, &cdc_acm_config_##idx,		\
-		PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,		\
-		&cdc_acm_driver_api);
+		PRE_KERNEL_1, &cdc_acm_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(CDC_ACM_DT_DEVICE_DEFINE);
diff --git a/subsys/usb/device/class/hid/core.c b/subsys/usb/device/class/hid/core.c
@@ -733,13 +733,11 @@ static int usb_hid_device_init(const struct device *dev)
 	struct hid_device_info usb_hid_dev_data_##x
 
 #define DEFINE_HID_DEVICE(x, _)						\
-	DEVICE_DEFINE(usb_hid_device_##x,				\
-			    CONFIG_USB_HID_DEVICE_NAME "_" #x,		\
+	DEVICE_INSTANCE(usb_hid_device_##x,				\
 			    &usb_hid_device_init,			\
 			    NULL,					\
 			    &usb_hid_dev_data_##x,			\
 			    &hid_config_##x, POST_KERNEL,		\
-			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
 			    &hid_api)
 
 LISTIFY(CONFIG_USB_HID_DEVICE_COUNT, DEFINE_HID_DESCR, (;), _);
diff --git a/subsys/usb/device_next/class/usbd_cdc_acm.c b/subsys/usb/device_next/class/usbd_cdc_acm.c
@@ -1267,10 +1267,9 @@ const static struct usb_desc_header *cdc_acm_hs_desc_##n[] = {			\
 		.hs_desc = cdc_acm_hs_desc_##n,					\
 	};									\
 										\
-	DEVICE_DT_INST_DEFINE(n, usbd_cdc_acm_preinit, NULL,			\
+	DEVICE_INSTANCE_FROM_DT_INST(n, usbd_cdc_acm_preinit, NULL,		\
 		&uart_data_##n, NULL,						\
-		PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY,			\
-		&cdc_acm_uart_api);
+		PRE_KERNEL_1, &cdc_acm_uart_api);
 
 DT_INST_FOREACH_STATUS_OKAY(USBD_CDC_ACM_DT_DEVICE_DEFINE);
 
diff --git a/subsys/usb/device_next/class/usbd_hid.c b/subsys/usb/device_next/class/usbd_hid.c
@@ -767,9 +767,8 @@ static const struct hid_device_driver_api hid_device_api = {
 										\
 	static struct hid_device_data hid_data_##n;				\
 										\
-	DEVICE_DT_INST_DEFINE(n, hid_device_init, NULL,				\
+	DEVICE_INSTANCE_FROM_DT_INST(n, hid_device_init, NULL,			\
 		&hid_data_##n, &hid_config_##n,					\
-		POST_KERNEL, CONFIG_USBD_HID_INIT_PRIORITY,			\
-		&hid_device_api);
+		POST_KERNEL, &hid_device_api);
 
 DT_INST_FOREACH_STATUS_OKAY(USBD_HID_INSTANCE_DEFINE);
diff --git a/subsys/usb/device_next/class/usbd_uac2.c b/subsys/usb/device_next/class/usbd_uac2.c
@@ -962,10 +962,9 @@ struct usbd_class_api uac2_api = {
 		"UAC2 implementation supports up to 32 AS interfaces");		\
 	BUILD_ASSERT(ARRAY_SIZE(entity_types_##inst) <= 255,			\
 		"UAC2 supports up to 255 entities");				\
-	DEVICE_DT_DEFINE(DT_DRV_INST(inst), NULL, NULL,				\
+	DEVICE_INSTANCE(DT_DRV_INST(inst), NULL, NULL,				\
 		&uac2_ctx_##inst, &uac2_cfg_##inst,				\
-		POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,		\
-		NULL);
+		POST_KERNEL, NULL);
 DT_INST_FOREACH_STATUS_OKAY(DEFINE_UAC2_CLASS_DATA)
 
 static size_t clock_frequencies(struct usbd_class_data *const c_data,
diff --git a/subsys/usb/usb_c/usbc_stack.c b/subsys/usb/usb_c/usbc_stack.c
@@ -88,9 +88,9 @@ static ALWAYS_INLINE void usbc_handler(void *port_dev)
 		.create_thread = create_thread_##inst,                                             \
 	};                                                                                         \
                                                                                                    \
-	DEVICE_DT_INST_DEFINE(inst, &usbc_subsys_init, NULL, &usbc_port_data_##inst,               \
+	DEVICE_INSTANCE_FROM_DT_INST(inst, &usbc_subsys_init, NULL, &usbc_port_data_##inst,        \
 			      &usbc_port_config_##inst, POST_KERNEL,                               \
-			      CONFIG_USBC_STACK_INIT_PRIORITY, NULL);
+			      NULL);
 
 DT_INST_FOREACH_STATUS_OKAY(USBC_SUBSYS_INIT)
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static int double_tap_init(const struct device *dev)`
`119`	`119`	`.double_tap_delay_ms = DT_INST_PROP(inst, double_tap_delay_ms), \`
`120`	`120`	`}; \`
`121`	`121`	`\`
`122`		`- DEVICE_DT_INST_DEFINE(inst, double_tap_init, NULL, NULL, &double_tap_config_##inst, \`
`123`		`- POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);`
	`122`	`+ DEVICE_INSTANCE_FROM_DT_INST(inst, double_tap_init, NULL, NULL, &double_tap_config_##inst, \`
	`123`	`+ POST_KERNEL, NULL);`
`124`	`124`
`125`	`125`	`DT_INST_FOREACH_STATUS_OKAY(INPUT_DOUBLE_TAP_DEFINE)`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,8 @@ static int keymap_init(const struct device *dev)`
`118`	`118`	`\`
`119`	`119`	`static struct keymap_data keymap_data_##inst; \`
`120`	`120`	`\`
`121`		`- DEVICE_DT_INST_DEFINE(inst, keymap_init, NULL, \`
	`121`	`+ DEVICE_INSTANCE_FROM_DT_INST(inst, keymap_init, NULL, \`
`122`	`122`	`&keymap_data_##inst, &keymap_config_##inst, \`
`123`		`- POST_KERNEL, CONFIG_INPUT_INIT_PRIORITY, NULL);`
	`123`	`+ POST_KERNEL, NULL);`
`124`	`124`
`125`	`125`	`DT_INST_FOREACH_STATUS_OKAY(INPUT_KEYMAP_DEFINE)`