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

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 <[email protected]>

Author: tbursztyka

tests/benchmarks/footprints/src/pm_device.c

@@ -25,12 +25,12 @@ static int dummy_device_pm_action(const struct device *dev,
 /* Define a driver with and without power management enabled */
 PM_DEVICE_DEFINE(dummy_pm_driver, dummy_device_pm_action);
 
-DEVICE_DEFINE(dummy_pm_driver, DUMMY_PM_DRIVER_NAME, NULL,
+DEVICE_INSTANCE(dummy_pm_driver, NULL,
 	      PM_DEVICE_GET(dummy_pm_driver), NULL, NULL, POST_KERNEL,
-	      CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
+	      NULL);
 
-DEVICE_DEFINE(dummy_driver, DUMMY_DRIVER_NAME, NULL, NULL, NULL, NULL,
-	      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
+DEVICE_INSTANCE(dummy_driver, NULL, NULL, NULL, NULL,
+	      POST_KERNEL, NULL);
 
 void run_pm_device(void)
 {

tests/bluetooth/bluetooth/src/bluetooth.c

@@ -43,8 +43,8 @@ static const struct bt_hci_driver_api driver_api = {
 #define TEST_DEVICE_INIT(inst) \
 	static struct driver_data driver_data_##inst = { \
 	}; \
-	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &driver_data_##inst, NULL, \
-			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &driver_api)
+	DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &driver_data_##inst, NULL,\
+			      POST_KERNEL, &driver_api)
 
 DT_INST_FOREACH_STATUS_OKAY(TEST_DEVICE_INIT)
 

tests/bluetooth/hci_prop_evt/src/main.c

@@ -243,8 +243,8 @@ static const struct bt_hci_driver_api driver_api = {
 #define TEST_DEVICE_INIT(inst) \
 	static struct driver_data driver_data_##inst = { \
 	}; \
-	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &driver_data_##inst, NULL, \
-			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &driver_api)
+	DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &driver_data_##inst, NULL,\
+			      POST_KERNEL, &driver_api)
 
 DT_INST_FOREACH_STATUS_OKAY(TEST_DEVICE_INIT)
 

tests/bluetooth/hci_uart_async/src/test_hci_uart_async.c

@@ -51,8 +51,8 @@ static int drv_init(const struct device *dev)
 #define TEST_DEVICE_INIT(inst) \
 	static struct drv_data drv_data_##inst = { \
 	}; \
-	DEVICE_DT_INST_DEFINE(inst, drv_init, NULL, &drv_data_##inst, NULL, \
-			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &drv_api)
+	DEVICE_INSTANCE_FROM_DT_INST(inst, drv_init, NULL, &drv_data_##inst, NULL,\
+			      POST_KERNEL, &drv_api)
 
 DT_INST_FOREACH_STATUS_OKAY(TEST_DEVICE_INIT)
 

tests/bluetooth/host_long_adv_recv/src/main.c

@@ -257,8 +257,8 @@ static const struct bt_hci_driver_api driver_api = {
 #define TEST_DEVICE_INIT(inst) \
 	static struct driver_data driver_data_##inst = { \
 	}; \
-	DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &driver_data_##inst, NULL, \
-			      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &driver_api)
+	DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &driver_data_##inst, NULL,\
+			      POST_KERNEL, &driver_api)
 
 DT_INST_FOREACH_STATUS_OKAY(TEST_DEVICE_INIT)
 

tests/drivers/espi/src/stub_espi_emul_host.c

@@ -32,8 +32,7 @@ static struct emul_espi_host_stub_dev_config stub_host_config;
 static struct emul_espi_host_stub_dev_api stub_host_api;
 
 #define EMUL_ESPI_HOST_DEVICE_STUB(n)                                                              \
-	DEVICE_DT_INST_DEFINE(n, &emul_espi_host_init_stub, NULL, &stub_host_data,                 \
-			      &stub_host_config, POST_KERNEL, CONFIG_ESPI_INIT_PRIORITY,           \
-			      &stub_host_api)
+	DEVICE_INSTANCE_FROM_DT_INST(n, &emul_espi_host_init_stub, NULL, &stub_host_data,          \
+			      &stub_host_config, POST_KERNEL, &stub_host_api)
 
 DT_INST_FOREACH_STATUS_OKAY(EMUL_ESPI_HOST_DEVICE_STUB);

tests/drivers/gnss/gnss_dump/src/main.c

@@ -8,8 +8,8 @@
 #include <zephyr/drivers/gnss/gnss_publish.h>
 #include <zephyr/device.h>
 
-DEVICE_DEFINE(gnss_dev, "gnss_dev", NULL, NULL, NULL, NULL,
-	      POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
+DEVICE_INSTANCE(gnss_dev, NULL, NULL, NULL, NULL,
+	      POST_KERNEL, NULL);
 
 static const struct device *gnss_dev = &DEVICE_NAME_GET(gnss_dev);
 static struct gnss_data test_data;

tests/drivers/i2c/i2c_target_api/common/i2c_virtual.c

@@ -222,7 +222,6 @@ static int i2c_virtual_init(const struct device *dev)
 
 static struct i2c_virtual_data i2c_virtual_dev_data_0;
 
-DEVICE_DEFINE(i2c_virtual_0, CONFIG_I2C_VIRTUAL_NAME, &i2c_virtual_init,
+DEVICE_INSTANCE(i2c_virtual_0, &i2c_virtual_init,
 		NULL, &i2c_virtual_dev_data_0, NULL,
-		POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
-		&api_funcs);
+		POST_KERNEL, &api_funcs);

tests/drivers/input/kbd_matrix/src/main.c

@@ -57,9 +57,9 @@ static const struct input_kbd_matrix_common_config
 
 static struct input_kbd_matrix_common_data test_data;
 
-DEVICE_DT_DEFINE(TEST_KBD_SCAN_NODE, input_kbd_matrix_common_init, NULL,
+DEVICE_INSTANCE(TEST_KBD_SCAN_NODE, input_kbd_matrix_common_init, NULL,
 		 &test_data, &test_cfg,
-		 POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, NULL);
+		 POST_KERNEL, NULL);
 
 static const struct device *const test_dev = DEVICE_DT_GET(TEST_KBD_SCAN_NODE);
 

tests/drivers/ipm/src/main.c

@@ -32,9 +32,9 @@ extern struct ipm_driver_api ipm_dummy_api;
 
 /* Set up the dummy IPM driver */
 struct ipm_dummy_driver_data ipm_dummy0_driver_data;
-DEVICE_DEFINE(ipm_dummy0, "ipm_dummy0", NULL,
+DEVICE_INSTANCE(ipm_dummy0, NULL,
 		NULL, &ipm_dummy0_driver_data, NULL,
-		PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+		PRE_KERNEL_1,
 		&ipm_dummy_api);
 
 /* Sending side of the console IPM driver, will forward anything sent
@@ -44,9 +44,9 @@ static struct ipm_console_sender_config_info sender_config = {
 	.bind_to = "ipm_dummy0",
 	.flags = SOURCE
 };
-DEVICE_DEFINE(ipm_console_send0, "ipm_send0", ipm_console_sender_init,
+DEVICE_INSTANCE(ipm_console_send0, ipm_console_sender_init,
 	      NULL, NULL, &sender_config,
-	      POST_KERNEL, INIT_PRIO_IPM_SEND, NULL);
+	      POST_KERNEL, NULL);
 
 /* Receiving side of the console IPM driver. These numbers are
  * more or less arbitrary
@@ -70,9 +70,9 @@ static struct ipm_console_receiver_config_info receiver_config = {
 };
 
 struct ipm_console_receiver_runtime_data receiver_data;
-DEVICE_DEFINE(ipm_console_recv0, "ipm_recv0", ipm_console_receiver_init,
+DEVICE_INSTANCE(ipm_console_recv0, ipm_console_receiver_init,
 	      NULL, &receiver_data, &receiver_config,
-	      POST_KERNEL, INIT_PRIO_IPM_RECV, NULL);
+	      POST_KERNEL, NULL);
 
 static const char thestr[] = "everything is awesome\n";