drivers: Convert to use new DEVICE_DT_INST_* macros
Move users that are DEVICE_DT_DECLARE(DT_DRV_INST(n, ...)) to
DEVICE_DT_INST_DECLARE(n, ...) and similar for DEVICE_DT_DEFINE.
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index e25655f..268a2dc 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -883,7 +883,7 @@
.size = INST_0_BYTES,
};
-DEVICE_DT_DEFINE(DT_DRV_INST(0), &qspi_nor_init, device_pm_control_nop,
- &qspi_nor_memory_data, &flash_id,
- POST_KERNEL, CONFIG_NORDIC_QSPI_NOR_INIT_PRIORITY,
- &qspi_nor_api);
+DEVICE_DT_INST_DEFINE(0, &qspi_nor_init, device_pm_control_nop,
+ &qspi_nor_memory_data, &flash_id,
+ POST_KERNEL, CONFIG_NORDIC_QSPI_NOR_INIT_PRIORITY,
+ &qspi_nor_api);
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index f794c05..ae064ab 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -281,7 +281,7 @@
return 0;
}
-DEVICE_DT_DEFINE(DT_DRV_INST(0), nrf_flash_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(0, nrf_flash_init, device_pm_control_nop,
NULL, NULL,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&flash_nrf_api);
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
index cddf2bb..8817310 100644
--- a/drivers/flash/spi_nor.c
+++ b/drivers/flash/spi_nor.c
@@ -1039,7 +1039,7 @@
static struct spi_nor_data spi_nor_data_0;
-DEVICE_DT_DEFINE(DT_DRV_INST(0), &spi_nor_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(0, &spi_nor_init, device_pm_control_nop,
&spi_nor_data_0, &spi_nor_config_0,
POST_KERNEL, CONFIG_SPI_NOR_INIT_PRIORITY,
&spi_nor_api);
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index 044128f..7c11edb 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -666,7 +666,7 @@
.lock = Z_SEM_INITIALIZER(sx1509b_drvdata.lock, 1, 1),
};
-DEVICE_DT_DEFINE(DT_DRV_INST(0), sx1509b_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(0, sx1509b_init, device_pm_control_nop,
&sx1509b_drvdata, &sx1509b_cfg,
POST_KERNEL, CONFIG_GPIO_SX1509B_INIT_PRIORITY,
&api_table);
diff --git a/drivers/regulator/regulator_fixed.c b/drivers/regulator/regulator_fixed.c
index e1a9511..02b94c9 100644
--- a/drivers/regulator/regulator_fixed.c
+++ b/drivers/regulator/regulator_fixed.c
@@ -386,7 +386,7 @@
\
static struct REG_DATA_TAG(id) regulator_##id##_data; \
\
-DEVICE_DT_DEFINE(DT_DRV_INST(id), REG_INIT(id), device_pm_control_nop, \
+DEVICE_DT_INST_DEFINE(id, REG_INIT(id), device_pm_control_nop, \
®ulator_##id##_data, ®ulator_##id##_cfg, \
POST_KERNEL, CONFIG_REGULATOR_FIXED_INIT_PRIORITY, \
®_API(id));
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index 24e902c..bd04ecd 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/drivers/sensor/ccs811/ccs811.c
@@ -593,7 +593,7 @@
static struct ccs811_data ccs811_driver;
-DEVICE_DT_DEFINE(DT_DRV_INST(0), ccs811_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(0, ccs811_init, device_pm_control_nop,
&ccs811_driver, NULL,
POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
&ccs811_driver_api);
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index aa4897f..af29821 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -52,7 +52,7 @@
static NRF_UART_Type *const uart0_addr = (NRF_UART_Type *)DT_INST_REG_ADDR(0);
-DEVICE_DT_DECLARE(DT_DRV_INST(0));
+DEVICE_DT_INST_DECLARE(0);
/* Device data structure */
struct uart_nrfx_data {
@@ -1195,7 +1195,7 @@
}
};
-DEVICE_DT_DEFINE(DT_DRV_INST(0),
+DEVICE_DT_INST_DEFINE(0,
uart_nrfx_init,
uart_nrfx_pm_control,
&uart_nrfx_uart0_data,
