From 5f605fd5abda4d80209e2d662beef9f82ba29f1a Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Tue, 15 Dec 2020 18:53:48 -0600
Subject: [PATCH] drivers: sensor: Convert drivers to new DT device macros

Convert sensor drivers from:

    DEVICE_AND_API_INIT -> DEVICE_DT_INST_DEFINE
    DEVICE_GET -> DEVICE_DT_INST_GET
    DEVICE_DECLARE -> DEVICE_DT_INST_DECLARE

etc..

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 drivers/sensor/adt7420/adt7420.c                 | 2 +-
 drivers/sensor/adxl345/adxl345.c                 | 2 +-
 drivers/sensor/adxl362/adxl362.c                 | 2 +-
 drivers/sensor/adxl372/adxl372.c                 | 2 +-
 drivers/sensor/ak8975/ak8975.c                   | 2 +-
 drivers/sensor/amg88xx/amg88xx.c                 | 2 +-
 drivers/sensor/ams_iAQcore/iAQcore.c             | 2 +-
 drivers/sensor/apds9960/apds9960.c               | 2 +-
 drivers/sensor/bma280/bma280.c                   | 3 +--
 drivers/sensor/bmc150_magn/bmc150_magn.c         | 2 +-
 drivers/sensor/bme280/bme280.c                   | 4 ++--
 drivers/sensor/bme680/bme680.c                   | 2 +-
 drivers/sensor/bmg160/bmg160.c                   | 2 +-
 drivers/sensor/bmi160/bmi160.c                   | 4 ++--
 drivers/sensor/bmm150/bmm150.c                   | 2 +-
 drivers/sensor/bq274xx/bq274xx.c                 | 4 ++--
 drivers/sensor/dht/dht.c                         | 2 +-
 drivers/sensor/dps310/dps310.c                   | 4 ++--
 drivers/sensor/ens210/ens210.c                   | 2 +-
 drivers/sensor/fxas21002/fxas21002.c             | 2 +-
 drivers/sensor/fxos8700/fxos8700.c               | 4 ++--
 drivers/sensor/grove/light_sensor.c              | 2 +-
 drivers/sensor/grove/temperature_sensor.c        | 2 +-
 drivers/sensor/hmc5883l/hmc5883l.c               | 4 ++--
 drivers/sensor/hp206c/hp206c.c                   | 3 +--
 drivers/sensor/hts221/hts221.c                   | 2 +-
 drivers/sensor/iis2dh/iis2dh.c                   | 2 +-
 drivers/sensor/iis2dlpc/iis2dlpc.c               | 2 +-
 drivers/sensor/iis2iclx/iis2iclx.c               | 4 ++--
 drivers/sensor/iis2mdc/iis2mdc.c                 | 2 +-
 drivers/sensor/iis3dhhc/iis3dhhc.c               | 2 +-
 drivers/sensor/isl29035/isl29035.c               | 2 +-
 drivers/sensor/ism330dhcx/ism330dhcx.c           | 2 +-
 drivers/sensor/lis2dh/lis2dh.c                   | 4 ++--
 drivers/sensor/lis2ds12/lis2ds12.c               | 2 +-
 drivers/sensor/lis2dw12/lis2dw12.c               | 2 +-
 drivers/sensor/lis2mdl/lis2mdl.c                 | 2 +-
 drivers/sensor/lis3mdl/lis3mdl.c                 | 2 +-
 drivers/sensor/lps22hb/lps22hb.c                 | 2 +-
 drivers/sensor/lps22hh/lps22hh.c                 | 2 +-
 drivers/sensor/lps25hb/lps25hb.c                 | 2 +-
 drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c | 4 ++--
 drivers/sensor/lsm6ds0/lsm6ds0.c                 | 2 +-
 drivers/sensor/lsm6dsl/lsm6dsl.c                 | 4 ++--
 drivers/sensor/lsm6dso/lsm6dso.c                 | 2 +-
 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c       | 4 ++--
 drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c         | 2 +-
 drivers/sensor/max17055/max17055.c               | 5 +++--
 drivers/sensor/max30101/max30101.c               | 2 +-
 drivers/sensor/max44009/max44009.c               | 2 +-
 drivers/sensor/mchp_tach_xec/tach_mchp_xec.c     | 4 ++--
 drivers/sensor/mcp9808/mcp9808.c                 | 2 +-
 drivers/sensor/mpr/mpr.c                         | 2 +-
 drivers/sensor/mpu6050/mpu6050.c                 | 4 ++--
 drivers/sensor/ms5607/ms5607.c                   | 4 ++--
 drivers/sensor/ms5837/ms5837.c                   | 2 +-
 drivers/sensor/nrf5/temp_nrf5.c                  | 8 ++++----
 drivers/sensor/nxp_kinetis_temp/temp_kinetis.c   | 5 +++--
 drivers/sensor/opt3001/opt3001.c                 | 2 +-
 drivers/sensor/pms7003/pms7003.c                 | 2 +-
 drivers/sensor/qdec_nrfx/qdec_nrfx.c             | 6 +++---
 drivers/sensor/sht3xd/sht3xd.c                   | 4 ++--
 drivers/sensor/si7006/si7006.c                   | 2 +-
 drivers/sensor/si7055/si7055.c                   | 2 +-
 drivers/sensor/si7060/si7060.c                   | 2 +-
 drivers/sensor/sm351lt/sm351lt.c                 | 4 ++--
 drivers/sensor/stts751/stts751.c                 | 2 +-
 drivers/sensor/sx9500/sx9500.c                   | 2 +-
 drivers/sensor/th02/th02.c                       | 2 +-
 drivers/sensor/ti_hdc/ti_hdc.c                   | 2 +-
 drivers/sensor/tmp007/tmp007.c                   | 2 +-
 drivers/sensor/tmp112/tmp112.c                   | 2 +-
 drivers/sensor/tmp116/tmp116.c                   | 2 +-
 drivers/sensor/vcnl4040/vcnl4040.c               | 2 +-
 drivers/sensor/vl53l0x/vl53l0x.c                 | 2 +-
 drivers/sensor/wsen_itds/itds.c                  | 2 +-
 76 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c
index fc7866ed207..43e0af128c4 100644
--- a/drivers/sensor/adt7420/adt7420.c
+++ b/drivers/sensor/adt7420/adt7420.c
@@ -230,6 +230,6 @@ static const struct adt7420_dev_config adt7420_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(adt7420, DT_INST_LABEL(0), adt7420_init, &adt7420_driver,
+DEVICE_DT_INST_DEFINE(0, adt7420_init, device_pm_control_nop, &adt7420_driver,
 		    &adt7420_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &adt7420_driver_api);
diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c
index 769e59f3d21..67e932a261a 100644
--- a/drivers/sensor/adxl345/adxl345.c
+++ b/drivers/sensor/adxl345/adxl345.c
@@ -190,6 +190,6 @@ static const struct adxl345_dev_config adxl345_config = {
 	.i2c_addr = DT_INST_REG_ADDR(0),
 };
 
-DEVICE_AND_API_INIT(adxl345, DT_INST_LABEL(0), adxl345_init,
+DEVICE_DT_INST_DEFINE(0, adxl345_init, device_pm_control_nop,
 		    &adxl345_data, &adxl345_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &adxl345_api_funcs);
diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c
index 74c9b829eaa..df80ff175c9 100644
--- a/drivers/sensor/adxl362/adxl362.c
+++ b/drivers/sensor/adxl362/adxl362.c
@@ -809,6 +809,6 @@ static const struct adxl362_config adxl362_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(adxl362, DT_INST_LABEL(0), adxl362_init,
+DEVICE_DT_INST_DEFINE(0, adxl362_init, device_pm_control_nop,
 		    &adxl362_data, &adxl362_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &adxl362_api_funcs);
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index 032914b7e64..d188b14dbf8 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -1024,6 +1024,6 @@ static const struct adxl372_dev_config adxl372_config = {
 	.op_mode = ADXL372_FULL_BW_MEASUREMENT,
 };
 
-DEVICE_AND_API_INIT(adxl372, DT_INST_LABEL(0), adxl372_init,
+DEVICE_DT_INST_DEFINE(0, adxl372_init, device_pm_control_nop,
 		    &adxl372_data, &adxl372_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &adxl372_api_funcs);
diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c
index 195080dbe35..436b2513e5f 100644
--- a/drivers/sensor/ak8975/ak8975.c
+++ b/drivers/sensor/ak8975/ak8975.c
@@ -170,7 +170,7 @@ int ak8975_init(const struct device *dev)
 
 struct ak8975_data ak8975_data;
 
-DEVICE_AND_API_INIT(ak8975, DT_INST_LABEL(0), ak8975_init,
+DEVICE_DT_INST_DEFINE(0, ak8975_init, device_pm_control_nop,
 		    &ak8975_data,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &ak8975_driver_api);
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index 4e485f37590..be63e8c8b01 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/drivers/sensor/amg88xx/amg88xx.c
@@ -153,7 +153,7 @@ static const struct amg88xx_config amg88xx_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(amg88xx, DT_INST_LABEL(0), amg88xx_init,
+DEVICE_DT_INST_DEFINE(0, amg88xx_init, device_pm_control_nop,
 		    &amg88xx_driver, &amg88xx_config,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &amg88xx_driver_api);
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c
index d25f22654a8..a3eb142c62c 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.c
+++ b/drivers/sensor/ams_iAQcore/iAQcore.c
@@ -114,6 +114,6 @@ static int iaq_core_init(const struct device *dev)
 
 static struct iaq_core_data iaq_core_driver;
 
-DEVICE_AND_API_INIT(iaq_core, DT_INST_LABEL(0), iaq_core_init,
+DEVICE_DT_INST_DEFINE(0, iaq_core_init, device_pm_control_nop,
 		    &iaq_core_driver, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &iaq_core_driver_api);
diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c
index 803467e0654..0d098de6082 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/drivers/sensor/apds9960/apds9960.c
@@ -543,6 +543,6 @@ static const struct apds9960_config apds9960_config = {
 
 static struct apds9960_data apds9960_data;
 
-DEVICE_DEFINE(apds9960, DT_INST_LABEL(0), apds9960_init,
+DEVICE_DT_INST_DEFINE(0, apds9960_init,
 	      apds9960_device_ctrl, &apds9960_data, &apds9960_config,
 	      POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api);
diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c
index 048f4e65d4f..6550186a7fd 100644
--- a/drivers/sensor/bma280/bma280.c
+++ b/drivers/sensor/bma280/bma280.c
@@ -163,7 +163,6 @@ int bma280_init(const struct device *dev)
 
 struct bma280_data bma280_driver;
 
-DEVICE_AND_API_INIT(bma280, DT_INST_LABEL(0),
-		    bma280_init, &bma280_driver,
+DEVICE_DT_INST_DEFINE(0, bma280_init, device_pm_control_nop, &bma280_driver,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &bma280_driver_api);
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index 171d056d81f..9dedf0db9c2 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.c
@@ -607,6 +607,6 @@ static const struct bmc150_magn_config bmc150_magn_config = {
 
 static struct bmc150_magn_data bmc150_magn_data;
 
-DEVICE_AND_API_INIT(bmc150_magn, DT_INST_LABEL(0), bmc150_magn_init,
+DEVICE_DT_INST_DEFINE(0, bmc150_magn_init, device_pm_control_nop,
 	    &bmc150_magn_data, &bmc150_magn_config, POST_KERNEL,
 	    CONFIG_SENSOR_INIT_PRIORITY, &bmc150_magn_api_funcs);
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index dada7cdcc4a..8457dff6041 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -590,9 +590,9 @@ done:
  */
 
 #define BME280_DEVICE_INIT(inst)					\
-	DEVICE_AND_API_INIT(bme280_##inst,				\
-			    DT_INST_LABEL(inst),			\
+	DEVICE_DT_INST_DEFINE(inst,					\
 			    bme280_init,				\
+			    device_pm_control_nop,			\
 			    &bme280_data_##inst,			\
 			    &bme280_config_##inst,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index 4fd349a73fe..819ea7230c6 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/drivers/sensor/bme680/bme680.c
@@ -428,6 +428,6 @@ static const struct sensor_driver_api bme680_api_funcs = {
 
 static struct bme680_data bme680_data;
 
-DEVICE_AND_API_INIT(bme680, DT_INST_LABEL(0), bme680_init, &bme680_data,
+DEVICE_DT_INST_DEFINE(0, bme680_init, device_pm_control_nop, &bme680_data,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &bme680_api_funcs);
diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c
index aeac68c5f5a..5c3f48ec8d6 100644
--- a/drivers/sensor/bmg160/bmg160.c
+++ b/drivers/sensor/bmg160/bmg160.c
@@ -346,7 +346,7 @@ const struct bmg160_device_config bmg160_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(bmg160, DT_INST_LABEL(0), bmg160_init,
+DEVICE_DT_INST_DEFINE(0, bmg160_init, device_pm_control_nop,
 		    &bmg160_data,
 		    &bmg160_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &bmg160_api);
diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c
index 7a0f59588c9..57e0705c455 100644
--- a/drivers/sensor/bmi160/bmi160.c
+++ b/drivers/sensor/bmi160/bmi160.c
@@ -981,8 +981,8 @@ int bmi160_init(const struct device *dev)
 #endif
 
 #define BMI160_DEVICE_INIT(inst)					\
-	DEVICE_AND_API_INIT(bmi160_##inst, DT_INST_LABEL(inst),		\
-		bmi160_init, &bmi160_data_##inst, &bmi160_cfg_##inst,	\
+	DEVICE_DT_INST_DEFINE(inst, bmi160_init, device_pm_control_nop,	\
+		&bmi160_data_##inst, &bmi160_cfg_##inst,		\
 		POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,		\
 		&bmi160_api);
 
diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c
index 012fac79f99..c637d01bcae 100644
--- a/drivers/sensor/bmm150/bmm150.c
+++ b/drivers/sensor/bmm150/bmm150.c
@@ -607,6 +607,6 @@ static const struct bmm150_config bmm150_config = {
 
 static struct bmm150_data bmm150_data;
 
-DEVICE_AND_API_INIT(bmm150, DT_INST_LABEL(0), bmm150_init,
+DEVICE_DT_INST_DEFINE(0, bmm150_init, device_pm_control_nop,
 			&bmm150_data, &bmm150_config, POST_KERNEL,
 			CONFIG_SENSOR_INIT_PRIORITY, &bmm150_api_funcs);
diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c
index 39c2e457a81..96f00cd77e1 100644
--- a/drivers/sensor/bq274xx/bq274xx.c
+++ b/drivers/sensor/bq274xx/bq274xx.c
@@ -626,8 +626,8 @@ static const struct sensor_driver_api bq274xx_battery_driver_api = {
 		.terminate_voltage = DT_INST_PROP(index, terminate_voltage),   \
 	};                                                                     \
 									       \
-	DEVICE_AND_API_INIT(bq274xx_##index, DT_INST_LABEL(index),             \
-			    &bq274xx_gauge_init, &bq274xx_driver_##index,      \
+	DEVICE_DT_INST_DEFINE(index, &bq274xx_gauge_init, device_pm_control_nop,\
+			    &bq274xx_driver_##index,                           \
 			    &bq274xx_config_##index, POST_KERNEL,              \
 			    CONFIG_SENSOR_INIT_PRIORITY,                       \
 			    &bq274xx_battery_driver_api);
diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c
index da5c31ddf36..4a4e5666257 100644
--- a/drivers/sensor/dht/dht.c
+++ b/drivers/sensor/dht/dht.c
@@ -247,6 +247,6 @@ static const struct dht_config dht_config = {
 	.pin = DT_INST_GPIO_PIN(0, dio_gpios),
 };
 
-DEVICE_AND_API_INIT(dht_dev, DT_INST_LABEL(0), &dht_init,
+DEVICE_DT_INST_DEFINE(0, &dht_init, device_pm_control_nop,
 		    &dht_data, &dht_config,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &dht_api);
diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c
index b509cc04cf9..af2c66d40e8 100644
--- a/drivers/sensor/dps310/dps310.c
+++ b/drivers/sensor/dps310/dps310.c
@@ -732,7 +732,7 @@ static const struct dps310_cfg dps310_cfg_0 = {
 	.i2c_addr = DT_INST_REG_ADDR(0)
 };
 
-DEVICE_AND_API_INIT(dps310, DT_INST_LABEL(0), dps310_init,
+DEVICE_DT_INST_DEFINE(0, dps310_init, device_pm_control_nop,
 		    &dps310_data_0, &dps310_cfg_0, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &dps310_api_funcs);
 #endif
@@ -744,7 +744,7 @@ static const struct dps310_cfg dps310_cfg_1 = {
 	.i2c_addr = DT_INST_REG_ADDR(1)
 };
 
-DEVICE_AND_API_INIT(dps310, DT_INST_LABEL(1), dps310_init,
+DEVICE_DT_INST_DEFINE(1, dps310_init, device_pm_control_nop,
 		    &dps310_data_1, &dps310_cfg_1, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &dps310_api_funcs);
 #endif
diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c
index 29c9f95c758..a847698d57b 100644
--- a/drivers/sensor/ens210/ens210.c
+++ b/drivers/sensor/ens210/ens210.c
@@ -344,6 +344,6 @@ static int ens210_init(const struct device *dev)
 
 static struct ens210_data ens210_driver;
 
-DEVICE_AND_API_INIT(ens210, DT_INST_LABEL(0), ens210_init, &ens210_driver,
+DEVICE_DT_INST_DEFINE(0, ens210_init, device_pm_control_nop, &ens210_driver,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &en210_driver_api);
diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c
index ece9156fc38..c4c8a05d256 100644
--- a/drivers/sensor/fxas21002/fxas21002.c
+++ b/drivers/sensor/fxas21002/fxas21002.c
@@ -310,7 +310,7 @@ static const struct fxas21002_config fxas21002_config = {
 
 static struct fxas21002_data fxas21002_data;
 
-DEVICE_AND_API_INIT(fxas21002, DT_INST_LABEL(0), fxas21002_init,
+DEVICE_DT_INST_DEFINE(0, fxas21002_init, device_pm_control_nop,
 		    &fxas21002_data, &fxas21002_config,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &fxas21002_driver_api);
diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c
index 0fd442464e4..74c5f22ea02 100644
--- a/drivers/sensor/fxos8700/fxos8700.c
+++ b/drivers/sensor/fxos8700/fxos8700.c
@@ -616,9 +616,9 @@ static const struct sensor_driver_api fxos8700_driver_api = {
 									\
 	static struct fxos8700_data fxos8700_data_##n;			\
 									\
-	DEVICE_AND_API_INIT(fxos8700_##n,				\
-			    DT_INST_LABEL(n),				\
+	DEVICE_DT_INST_DEFINE(n,					\
 			    fxos8700_init,				\
+			    device_pm_control_nop,			\
 			    &fxos8700_data_##n,				\
 			    &fxos8700_config_##n,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c
index fe1e3439f52..d37a2974305 100644
--- a/drivers/sensor/grove/light_sensor.c
+++ b/drivers/sensor/grove/light_sensor.c
@@ -120,6 +120,6 @@ static const struct gls_config gls_cfg = {
 	.adc_channel = DT_INST_IO_CHANNELS_INPUT(0),
 };
 
-DEVICE_AND_API_INIT(gls_dev, DT_INST_LABEL(0), &gls_init,
+DEVICE_DT_INST_DEFINE(0, &gls_init, device_pm_control_nop,
 		&gls_data, &gls_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		&gls_api);
diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c
index e281e61861f..2e4384d0454 100644
--- a/drivers/sensor/grove/temperature_sensor.c
+++ b/drivers/sensor/grove/temperature_sensor.c
@@ -125,6 +125,6 @@ static const struct gts_config gts_cfg = {
 	.adc_channel = DT_INST_IO_CHANNELS_INPUT(0),
 };
 
-DEVICE_AND_API_INIT(gts_dev, DT_INST_LABEL(0), &gts_init,
+DEVICE_DT_INST_DEFINE(0, &gts_init, device_pm_control_nop,
 		&gts_data, &gts_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		&gts_api);
diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c
index c67c090df4b..475a8c64b66 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.c
+++ b/drivers/sensor/hmc5883l/hmc5883l.c
@@ -161,6 +161,6 @@ int hmc5883l_init(const struct device *dev)
 
 struct hmc5883l_data hmc5883l_driver;
 
-DEVICE_AND_API_INIT(hmc5883l, DT_INST_LABEL(0),
-		    hmc5883l_init, &hmc5883l_driver, NULL, POST_KERNEL,
+DEVICE_DT_INST_DEFINE(0, hmc5883l_init, device_pm_control_nop,
+		    &hmc5883l_driver, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &hmc5883l_driver_api);
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
index 657dd0a6937..54cc0e5a7b6 100644
--- a/drivers/sensor/hp206c/hp206c.c
+++ b/drivers/sensor/hp206c/hp206c.c
@@ -318,7 +318,6 @@ static int hp206c_init(const struct device *dev)
 
 static struct hp206c_device_data hp206c_data;
 
-DEVICE_AND_API_INIT(hp206c, DT_INST_LABEL(0),
-		    hp206c_init, &hp206c_data,
+DEVICE_DT_INST_DEFINE(0, hp206c_init, device_pm_control_nop, &hp206c_data,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &hp206c_api);
diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c
index 1bc091bea80..16b0aac4a12 100644
--- a/drivers/sensor/hts221/hts221.c
+++ b/drivers/sensor/hts221/hts221.c
@@ -191,6 +191,6 @@ static const struct hts221_config hts221_cfg = {
 #endif /* HTS221_TRIGGER_ENABLED */
 };
 
-DEVICE_AND_API_INIT(hts221, DT_INST_LABEL(0), hts221_init,
+DEVICE_DT_INST_DEFINE(0, hts221_init, device_pm_control_nop,
 		    &hts221_driver, &hts221_cfg, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &hts221_driver_api);
diff --git a/drivers/sensor/iis2dh/iis2dh.c b/drivers/sensor/iis2dh/iis2dh.c
index b238f828c16..de45743db2c 100644
--- a/drivers/sensor/iis2dh/iis2dh.c
+++ b/drivers/sensor/iis2dh/iis2dh.c
@@ -311,6 +311,6 @@ const struct iis2dh_device_config iis2dh_cfg = {
 
 struct iis2dh_data iis2dh_data;
 
-DEVICE_AND_API_INIT(iis2dh, DT_INST_LABEL(0), iis2dh_init,
+DEVICE_DT_INST_DEFINE(0, iis2dh_init, device_pm_control_nop,
 	     &iis2dh_data, &iis2dh_cfg, POST_KERNEL,
 	     CONFIG_SENSOR_INIT_PRIORITY, &iis2dh_driver_api);
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c
index 5da5e318d11..f3ccd333695 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc.c
@@ -405,6 +405,6 @@ const struct iis2dlpc_device_config iis2dlpc_cfg = {
 
 struct iis2dlpc_data iis2dlpc_data;
 
-DEVICE_AND_API_INIT(iis2dlpc, DT_INST_LABEL(0), iis2dlpc_init,
+DEVICE_DT_INST_DEFINE(0, iis2dlpc_init, device_pm_control_nop,
 	     &iis2dlpc_data, &iis2dlpc_cfg, POST_KERNEL,
 	     CONFIG_SENSOR_INIT_PRIORITY, &iis2dlpc_driver_api);
diff --git a/drivers/sensor/iis2iclx/iis2iclx.c b/drivers/sensor/iis2iclx/iis2iclx.c
index 33f22766ca1..66cb5c8ed8c 100644
--- a/drivers/sensor/iis2iclx/iis2iclx.c
+++ b/drivers/sensor/iis2iclx/iis2iclx.c
@@ -642,9 +642,9 @@ static int iis2iclx_init(const struct device *dev)
  */
 
 #define IIS2ICLX_DEVICE_INIT(inst)					\
-	DEVICE_AND_API_INIT(iis2iclx_##inst,				\
-			    DT_INST_LABEL(inst),			\
+	DEVICE_DT_INST_DEFINE(inst,					\
 			    iis2iclx_init,				\
+			    device_pm_control_nop,			\
 			    &iis2iclx_data_##inst,			\
 			    &iis2iclx_config_##inst,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c
index 404481ad798..3fc77a07d5c 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.c
+++ b/drivers/sensor/iis2mdc/iis2mdc.c
@@ -367,6 +367,6 @@ static int iis2mdc_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_AND_API_INIT(iis2mdc, DT_INST_LABEL(0), iis2mdc_init,
+DEVICE_DT_INST_DEFINE(0, iis2mdc_init, device_pm_control_nop,
 		     &iis2mdc_data, &iis2mdc_dev_config, POST_KERNEL,
 		     CONFIG_SENSOR_INIT_PRIORITY, &iis2mdc_driver_api);
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c
index 4c1b5c3cd2d..3302e3d537c 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.c
@@ -253,6 +253,6 @@ static const struct iis3dhhc_config iis3dhhc_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(iis3dhhc, DT_INST_LABEL(0), iis3dhhc_init,
+DEVICE_DT_INST_DEFINE(0, iis3dhhc_init, device_pm_control_nop,
 		    &iis3dhhc_data, &iis3dhhc_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &iis3dhhc_api_funcs);
diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c
index bed0213de41..e771c49cbc9 100644
--- a/drivers/sensor/isl29035/isl29035.c
+++ b/drivers/sensor/isl29035/isl29035.c
@@ -144,6 +144,6 @@ static int isl29035_init(const struct device *dev)
 
 struct isl29035_driver_data isl29035_data;
 
-DEVICE_AND_API_INIT(isl29035_dev, DT_INST_LABEL(0), &isl29035_init,
+DEVICE_DT_INST_DEFINE(0, &isl29035_init, device_pm_control_nop,
 		    &isl29035_data, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &isl29035_api);
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c
index e4ce9a51e5a..65743bf88c7 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.c
@@ -848,6 +848,6 @@ static int ism330dhcx_init(const struct device *dev)
 
 static struct ism330dhcx_data ism330dhcx_data;
 
-DEVICE_AND_API_INIT(ism330dhcx, DT_INST_LABEL(0), ism330dhcx_init,
+DEVICE_DT_INST_DEFINE(0, ism330dhcx_init, device_pm_control_nop,
 		    &ism330dhcx_data, &ism330dhcx_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &ism330dhcx_api_funcs);
diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c
index 8c08450ac85..2322a072876 100644
--- a/drivers/sensor/lis2dh/lis2dh.c
+++ b/drivers/sensor/lis2dh/lis2dh.c
@@ -359,9 +359,9 @@ int lis2dh_init(const struct device *dev)
  */
 
 #define LIS2DH_DEVICE_INIT(inst)					\
-	DEVICE_AND_API_INIT(lis2dh_##inst,				\
-			    DT_INST_LABEL(inst),			\
+	DEVICE_DT_INST_DEFINE(inst,					\
 			    lis2dh_init,				\
+			    device_pm_control_nop,			\
 			    &lis2dh_data_##inst,			\
 			    &lis2dh_config_##inst,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c
index 5e1b05271f6..cff95488140 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.c
+++ b/drivers/sensor/lis2ds12/lis2ds12.c
@@ -325,6 +325,6 @@ static int lis2ds12_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_AND_API_INIT(lis2ds12, DT_INST_LABEL(0), lis2ds12_init,
+DEVICE_DT_INST_DEFINE(0, lis2ds12_init, device_pm_control_nop,
 		    &lis2ds12_data, &lis2ds12_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lis2ds12_api_funcs);
diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c
index 3752ef551a5..2356847af36 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.c
+++ b/drivers/sensor/lis2dw12/lis2dw12.c
@@ -405,6 +405,6 @@ const struct lis2dw12_device_config lis2dw12_cfg = {
 
 struct lis2dw12_data lis2dw12_data;
 
-DEVICE_AND_API_INIT(lis2dw12, DT_INST_LABEL(0), lis2dw12_init,
+DEVICE_DT_INST_DEFINE(0, lis2dw12_init, device_pm_control_nop,
 	     &lis2dw12_data, &lis2dw12_cfg, POST_KERNEL,
 	     CONFIG_SENSOR_INIT_PRIORITY, &lis2dw12_driver_api);
diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c
index c81f46f1d1b..3a58a83b477 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.c
+++ b/drivers/sensor/lis2mdl/lis2mdl.c
@@ -432,6 +432,6 @@ static int lis2mdl_pm_control(const struct device *dev, uint32_t ctrl_command,
 }
 #endif /* CONFIG_PM_DEVICE */
 
-DEVICE_DEFINE(lis2mdl, DT_INST_LABEL(0), lis2mdl_init,
+DEVICE_DT_INST_DEFINE(0, lis2mdl_init,
 		lis2mdl_pm_control, &lis2mdl_data, &lis2mdl_dev_config,
 		POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis2mdl_driver_api);
diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c
index 9d660cf1820..8d56a81f5ea 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.c
+++ b/drivers/sensor/lis3mdl/lis3mdl.c
@@ -166,6 +166,6 @@ int lis3mdl_init(const struct device *dev)
 
 struct lis3mdl_data lis3mdl_driver;
 
-DEVICE_AND_API_INIT(lis3mdl, DT_INST_LABEL(0), lis3mdl_init,
+DEVICE_DT_INST_DEFINE(0, lis3mdl_init, device_pm_control_nop,
 		    &lis3mdl_driver, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lis3mdl_driver_api);
diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c
index bd1d9f06eea..b8d0ac9db25 100644
--- a/drivers/sensor/lps22hb/lps22hb.c
+++ b/drivers/sensor/lps22hb/lps22hb.c
@@ -159,6 +159,6 @@ static const struct lps22hb_config lps22hb_config = {
 
 static struct lps22hb_data lps22hb_data;
 
-DEVICE_AND_API_INIT(lps22hb, DT_INST_LABEL(0), lps22hb_init,
+DEVICE_DT_INST_DEFINE(0, lps22hb_init, device_pm_control_nop,
 		    &lps22hb_data, &lps22hb_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lps22hb_api_funcs);
diff --git a/drivers/sensor/lps22hh/lps22hh.c b/drivers/sensor/lps22hh/lps22hh.c
index a67573bba2e..224d318ec0a 100644
--- a/drivers/sensor/lps22hh/lps22hh.c
+++ b/drivers/sensor/lps22hh/lps22hh.c
@@ -234,6 +234,6 @@ static const struct lps22hh_config lps22hh_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(lps22hh, DT_INST_LABEL(0), lps22hh_init,
+DEVICE_DT_INST_DEFINE(0, lps22hh_init, device_pm_control_nop,
 		    &lps22hh_data, &lps22hh_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lps22hh_api_funcs);
diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c
index d19cf78ed01..d19dbffbde7 100644
--- a/drivers/sensor/lps25hb/lps25hb.c
+++ b/drivers/sensor/lps25hb/lps25hb.c
@@ -187,6 +187,6 @@ static const struct lps25hb_config lps25hb_config = {
 
 static struct lps25hb_data lps25hb_data;
 
-DEVICE_AND_API_INIT(lps25hb, DT_INST_LABEL(0), lps25hb_init,
+DEVICE_DT_INST_DEFINE(0, lps25hb_init, device_pm_control_nop,
 		    &lps25hb_data, &lps25hb_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lps25hb_api_funcs);
diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
index ca16068937b..687893977f6 100644
--- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
+++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
@@ -139,7 +139,7 @@ static const struct lsm303dlhc_magn_config lsm303dlhc_magn_config = {
 
 static struct lsm303dlhc_magn_data lsm303dlhc_magn_driver;
 
-DEVICE_AND_API_INIT(lsm303dlhc_magn, DT_INST_LABEL(0),
-		    lsm303dlhc_magn_init, &lsm303dlhc_magn_driver,
+DEVICE_DT_INST_DEFINE(0, lsm303dlhc_magn_init, device_pm_control_nop,
+		    &lsm303dlhc_magn_driver,
 		    &lsm303dlhc_magn_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lsm303dlhc_magn_driver_api);
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c
index ac118dda655..7f44446c0fd 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.c
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.c
@@ -509,6 +509,6 @@ static const struct lsm6ds0_config lsm6ds0_config = {
 
 static struct lsm6ds0_data lsm6ds0_data;
 
-DEVICE_AND_API_INIT(lsm6ds0, DT_INST_LABEL(0), lsm6ds0_init,
+DEVICE_DT_INST_DEFINE(0, lsm6ds0_init, device_pm_control_nop,
 		    &lsm6ds0_data, &lsm6ds0_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lsm6ds0_api_funcs);
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c
index c8578810e7b..cdd6a2ded90 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.c
@@ -823,9 +823,9 @@ static int lsm6dsl_init(const struct device *dev)
  */
 
 #define LSM6DSL_DEVICE_INIT(inst)					\
-	DEVICE_AND_API_INIT(lsm6dsl_##inst,				\
-			    DT_INST_LABEL(inst),			\
+	DEVICE_DT_INST_DEFINE(inst,					\
 			    lsm6dsl_init,				\
+			    device_pm_control_nop,			\
 			    &lsm6dsl_data_##inst,			\
 			    &lsm6dsl_config_##inst,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c
index a738eb2de6e..436612cc295 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.c
+++ b/drivers/sensor/lsm6dso/lsm6dso.c
@@ -832,6 +832,6 @@ static int lsm6dso_init(const struct device *dev)
 
 static struct lsm6dso_data lsm6dso_data;
 
-DEVICE_AND_API_INIT(lsm6dso, DT_INST_LABEL(0), lsm6dso_init,
+DEVICE_DT_INST_DEFINE(0, lsm6dso_init, device_pm_control_nop,
 		    &lsm6dso_data, &lsm6dso_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lsm6dso_api_funcs);
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
index e6a3177747d..6fe7faaa202 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
@@ -355,7 +355,7 @@ static const struct lsm9ds0_gyro_config lsm9ds0_gyro_config = {
 
 static struct lsm9ds0_gyro_data lsm9ds0_gyro_data;
 
-DEVICE_AND_API_INIT(lsm9ds0_gyro, DT_INST_LABEL(0),
-		    lsm9ds0_gyro_init, &lsm9ds0_gyro_data, &lsm9ds0_gyro_config,
+DEVICE_DT_INST_DEFINE(0, lsm9ds0_gyro_init, device_pm_control_nop,
+		    &lsm9ds0_gyro_data, &lsm9ds0_gyro_config,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &lsm9ds0_gyro_api_funcs);
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
index 919ee210fc3..8837aca92d0 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
@@ -798,6 +798,6 @@ static const struct lsm9ds0_mfd_config lsm9ds0_mfd_config = {
 
 static struct lsm9ds0_mfd_data lsm9ds0_mfd_data;
 
-DEVICE_AND_API_INIT(lsm9ds0_mfd, DT_INST_LABEL(0), lsm9ds0_mfd_init,
+DEVICE_DT_INST_DEFINE(0, lsm9ds0_mfd_init, device_pm_control_nop,
 		    &lsm9ds0_mfd_data, &lsm9ds0_mfd_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &lsm9ds0_mfd_api_funcs);
diff --git a/drivers/sensor/max17055/max17055.c b/drivers/sensor/max17055/max17055.c
index cfef76f8f68..d4fd7095b3d 100644
--- a/drivers/sensor/max17055/max17055.c
+++ b/drivers/sensor/max17055/max17055.c
@@ -230,8 +230,9 @@ static const struct sensor_driver_api max17055_battery_driver_api = {
 			DT_INST_PROP(index, desired_charging_current),	\
 	};								\
 									\
-	DEVICE_AND_API_INIT(max17055_##index, DT_INST_LABEL(index),	\
-			    &max17055_gauge_init, &max17055_driver_##index, \
+	DEVICE_DT_INST_DEFINE(index, &max17055_gauge_init,		\
+			    device_pm_control_nop,			\
+			    &max17055_driver_##index,			\
 			    &max17055_config_##index, POST_KERNEL,	\
 			    CONFIG_SENSOR_INIT_PRIORITY,		\
 			    &max17055_battery_driver_api)
diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c
index 1239d1f8e45..7461e8c2499 100644
--- a/drivers/sensor/max30101/max30101.c
+++ b/drivers/sensor/max30101/max30101.c
@@ -248,7 +248,7 @@ static struct max30101_config max30101_config = {
 
 static struct max30101_data max30101_data;
 
-DEVICE_AND_API_INIT(max30101, DT_INST_LABEL(0), max30101_init,
+DEVICE_DT_INST_DEFINE(0, max30101_init, device_pm_control_nop,
 		    &max30101_data, &max30101_config,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &max30101_driver_api);
diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c
index 48bb6558f7b..8a6c04bc70c 100644
--- a/drivers/sensor/max44009/max44009.c
+++ b/drivers/sensor/max44009/max44009.c
@@ -188,6 +188,6 @@ int max44009_init(const struct device *dev)
 
 static struct max44009_data max44009_drv_data;
 
-DEVICE_AND_API_INIT(max44009, DT_INST_LABEL(0), max44009_init,
+DEVICE_DT_INST_DEFINE(0, max44009_init, device_pm_control_nop,
 	    &max44009_drv_data, NULL, POST_KERNEL,
 	    CONFIG_SENSOR_INIT_PRIORITY, &max44009_driver_api);
diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
index 09c82ee6756..0fbfb91fcca 100644
--- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
+++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
@@ -124,9 +124,9 @@ static const struct sensor_driver_api tach_xec_driver_api = {
 									\
 	static struct tach_xec_data tach_xec_dev_data##id;		\
 									\
-	DEVICE_AND_API_INIT(tach##id,					\
-			    DT_INST_LABEL(id),	\
+	DEVICE_DT_INST_DEFINE(id,					\
 			    tach_xec_init,				\
+			    device_pm_control_nop,			\
 			    &tach_xec_dev_data##id,			\
 			    &tach_xec_dev_config##id,			\
 			    POST_KERNEL,				\
diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c
index ab88bfabffb..24f69f31224 100644
--- a/drivers/sensor/mcp9808/mcp9808.c
+++ b/drivers/sensor/mcp9808/mcp9808.c
@@ -100,6 +100,6 @@ static const struct mcp9808_config mcp9808_cfg = {
 #endif /* CONFIG_MCP9808_TRIGGER */
 };
 
-DEVICE_AND_API_INIT(mcp9808, DT_INST_LABEL(0), mcp9808_init,
+DEVICE_DT_INST_DEFINE(0, mcp9808_init, device_pm_control_nop,
 		    &mcp9808_data, &mcp9808_cfg, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &mcp9808_api_funcs);
diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c
index 104787cd376..6885f110f80 100644
--- a/drivers/sensor/mpr/mpr.c
+++ b/drivers/sensor/mpr/mpr.c
@@ -137,6 +137,6 @@ static const struct mpr_config mpr_cfg = {
 	.i2c_addr = DT_INST_REG_ADDR(0),
 };
 
-DEVICE_AND_API_INIT(mpr, DT_INST_LABEL(0), mpr_init, &mpr_data,
+DEVICE_DT_INST_DEFINE(0, mpr_init, device_pm_control_nop, &mpr_data,
 			&mpr_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 			&mpr_api_funcs);
diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c
index ad43f165b8f..c533baf63bc 100644
--- a/drivers/sensor/mpu6050/mpu6050.c
+++ b/drivers/sensor/mpu6050/mpu6050.c
@@ -237,7 +237,7 @@ static const struct mpu6050_config mpu6050_cfg = {
 #endif /* CONFIG_MPU6050_TRIGGER */
 };
 
-DEVICE_AND_API_INIT(mpu6050, DT_INST_LABEL(0),
-		    mpu6050_init, &mpu6050_driver, &mpu6050_cfg,
+DEVICE_DT_INST_DEFINE(0, mpu6050_init, device_pm_control_nop,
+		    &mpu6050_driver, &mpu6050_cfg,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &mpu6050_driver_api);
diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c
index 558c201f713..db54696fda5 100644
--- a/drivers/sensor/ms5607/ms5607.c
+++ b/drivers/sensor/ms5607/ms5607.c
@@ -328,9 +328,9 @@ static const struct sensor_driver_api ms5607_api_funcs = {
 
 static struct ms5607_data ms5607_data;
 
-DEVICE_AND_API_INIT(ms5607,
-		    DT_INST_LABEL(0),
+DEVICE_DT_INST_DEFINE(0,
 		    ms5607_init,
+		    device_pm_control_nop,
 		    &ms5607_data,
 		    &ms5607_config,
 		    POST_KERNEL,
diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c
index d9317935f20..8f037fbf679 100644
--- a/drivers/sensor/ms5837/ms5837.c
+++ b/drivers/sensor/ms5837/ms5837.c
@@ -326,6 +326,6 @@ static const struct ms5837_config ms5837_config = {
 	.i2c_address = DT_INST_REG_ADDR(0)
 };
 
-DEVICE_AND_API_INIT(ms5837, DT_INST_LABEL(0), ms5837_init, &ms5837_data,
+DEVICE_DT_INST_DEFINE(0, ms5837_init, device_pm_control_nop, &ms5837_data,
 		    &ms5837_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &ms5837_api_funcs);
diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
index f755c5742a3..3490bfc01e9 100644
--- a/drivers/sensor/nrf5/temp_nrf5.c
+++ b/drivers/sensor/nrf5/temp_nrf5.c
@@ -108,7 +108,7 @@ static const struct sensor_driver_api temp_nrf5_driver_api = {
 	.channel_get = temp_nrf5_channel_get,
 };
 
-DEVICE_DECLARE(temp_nrf5);
+DEVICE_DT_INST_DECLARE(0);
 
 static int temp_nrf5_init(const struct device *dev)
 {
@@ -128,7 +128,7 @@ static int temp_nrf5_init(const struct device *dev)
 		DT_INST_IRQN(0),
 		DT_INST_IRQ(0, priority),
 		temp_nrf5_isr,
-		DEVICE_GET(temp_nrf5),
+		DEVICE_DT_INST_GET(0),
 		0);
 	irq_enable(DT_INST_IRQN(0));
 
@@ -139,9 +139,9 @@ static int temp_nrf5_init(const struct device *dev)
 
 static struct temp_nrf5_data temp_nrf5_driver;
 
-DEVICE_AND_API_INIT(temp_nrf5,
-		    DT_INST_LABEL(0),
+DEVICE_DT_INST_DEFINE(0,
 		    temp_nrf5_init,
+		    device_pm_control_nop,
 		    &temp_nrf5_driver,
 		    NULL,
 		    POST_KERNEL,
diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
index b0aeadc4679..caea7640acb 100644
--- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
+++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
@@ -215,8 +215,9 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1,
 		},							\
 	};								\
 									\
-	DEVICE_AND_API_INIT(temp_kinetis, DT_INST_LABEL(inst),		\
-			    temp_kinetis_init, &temp_kinetis_data_0,	\
+	DEVICE_DT_INST_DEFINE(inst, temp_kinetis_init,			\
+			    device_pm_control_nop,			\
+			    &temp_kinetis_data_0,			\
 			    &temp_kinetis_config_0, POST_KERNEL,	\
 			    CONFIG_SENSOR_INIT_PRIORITY,		\
 			    &temp_kinetis_driver_api);
diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c
index 7158d647853..0222547f811 100644
--- a/drivers/sensor/opt3001/opt3001.c
+++ b/drivers/sensor/opt3001/opt3001.c
@@ -165,6 +165,6 @@ int opt3001_init(const struct device *dev)
 
 static struct opt3001_data opt3001_drv_data;
 
-DEVICE_AND_API_INIT(opt3001, DT_INST_LABEL(0), opt3001_init,
+DEVICE_DT_INST_DEFINE(0, opt3001_init, device_pm_control_nop,
 		    &opt3001_drv_data, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &opt3001_driver_api);
diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c
index f701cfa319e..64de7c35e0e 100644
--- a/drivers/sensor/pms7003/pms7003.c
+++ b/drivers/sensor/pms7003/pms7003.c
@@ -185,6 +185,6 @@ static int pms7003_init(const struct device *dev)
 
 static struct pms7003_data pms7003_data;
 
-DEVICE_AND_API_INIT(gts_dev, DT_INST_LABEL(0), &pms7003_init,
+DEVICE_DT_INST_DEFINE(0, &pms7003_init, device_pm_control_nop,
 		    &pms7003_data, NULL, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &pms7003_api);
diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
index 5a734792b0a..ca18d68ecee 100644
--- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
@@ -32,7 +32,7 @@ struct qdec_nrfx_data {
 
 static struct qdec_nrfx_data qdec_nrfx_data;
 
-DEVICE_DECLARE(qdec_nrfx);
+DEVICE_DT_INST_DECLARE(0);
 
 
 static void accumulate(struct qdec_nrfx_data *data, int16_t acc)
@@ -151,7 +151,7 @@ static void qdec_nrfx_event_handler(nrfx_qdec_event_t event)
 				.chan = SENSOR_CHAN_ROTATION,
 			};
 
-			handler(DEVICE_GET(qdec_nrfx), &trig);
+			handler(DEVICE_DT_INST_GET(0), &trig);
 		}
 		break;
 
@@ -308,6 +308,6 @@ static const struct sensor_driver_api qdec_nrfx_driver_api = {
 	.trigger_set  = qdec_nrfx_trigger_set,
 };
 
-DEVICE_DEFINE(qdec_nrfx, DT_INST_LABEL(0), qdec_nrfx_init,
+DEVICE_DT_INST_DEFINE(0, qdec_nrfx_init,
 		qdec_nrfx_pm_control, NULL, NULL, POST_KERNEL,
 		CONFIG_SENSOR_INIT_PRIORITY, &qdec_nrfx_driver_api);
diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c
index 53d38b2671c..8c6d38b6e71 100644
--- a/drivers/sensor/sht3xd/sht3xd.c
+++ b/drivers/sensor/sht3xd/sht3xd.c
@@ -239,7 +239,7 @@ static const struct sht3xd_config sht3xd0_cfg = {
 #endif
 };
 
-DEVICE_AND_API_INIT(sht3xd0, DT_INST_LABEL(0),
-		    sht3xd_init, &sht3xd0_driver, &sht3xd0_cfg,
+DEVICE_DT_INST_DEFINE(0, sht3xd_init, device_pm_control_nop,
+		    &sht3xd0_driver, &sht3xd0_cfg,
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &sht3xd_driver_api);
diff --git a/drivers/sensor/si7006/si7006.c b/drivers/sensor/si7006/si7006.c
index 695175297aa..1a5fd553f3e 100644
--- a/drivers/sensor/si7006/si7006.c
+++ b/drivers/sensor/si7006/si7006.c
@@ -165,5 +165,5 @@ static int si7006_init(const struct device *dev)
 
 static struct si7006_data si_data;
 
-DEVICE_AND_API_INIT(si7006, DT_INST_LABEL(0), si7006_init,
+DEVICE_DT_INST_DEFINE(0, si7006_init, device_pm_control_nop,
 	&si_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &si7006_api);
diff --git a/drivers/sensor/si7055/si7055.c b/drivers/sensor/si7055/si7055.c
index 6ca16eee29d..5dc48976a67 100644
--- a/drivers/sensor/si7055/si7055.c
+++ b/drivers/sensor/si7055/si7055.c
@@ -147,5 +147,5 @@ static int si7055_init(const struct device *dev)
 
 static struct si7055_data si_data;
 
-DEVICE_AND_API_INIT(si7055, DT_INST_LABEL(0), si7055_init,
+DEVICE_DT_INST_DEFINE(0, si7055_init, device_pm_control_nop,
 	&si_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &si7055_api);
diff --git a/drivers/sensor/si7060/si7060.c b/drivers/sensor/si7060/si7060.c
index c36cf3dfb0c..32d1acfb818 100644
--- a/drivers/sensor/si7060/si7060.c
+++ b/drivers/sensor/si7060/si7060.c
@@ -134,5 +134,5 @@ static int si7060_init(const struct device *dev)
 
 static struct si7060_data si_data;
 
-DEVICE_AND_API_INIT(si7060, DT_INST_LABEL(0), si7060_init,
+DEVICE_DT_INST_DEFINE(0, si7060_init, device_pm_control_nop,
 	&si_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &si7060_api);
diff --git a/drivers/sensor/sm351lt/sm351lt.c b/drivers/sensor/sm351lt/sm351lt.c
index 380e55b3f96..a180174c2d3 100644
--- a/drivers/sensor/sm351lt/sm351lt.c
+++ b/drivers/sensor/sm351lt/sm351lt.c
@@ -255,9 +255,9 @@ static int sm351lt_init(const struct device *dev)
 		.gpio_flags = DT_INST_GPIO_FLAGS(inst, gpios),	     \
 	};							     \
 								     \
-	DEVICE_AND_API_INIT(sm351lt_##inst,			     \
-			    DT_INST_LABEL(inst),		     \
+	DEVICE_DT_INST_DEFINE(inst,				     \
 			    sm351lt_init,			     \
+			    device_pm_control_nop,		     \
 			    &sm351lt_data_##inst,		     \
 			    &sm351lt_config_##inst,		     \
 			    POST_KERNEL,			     \
diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c
index a6589f4a6e2..51a1f11f415 100644
--- a/drivers/sensor/stts751/stts751.c
+++ b/drivers/sensor/stts751/stts751.c
@@ -215,6 +215,6 @@ static const struct stts751_config stts751_config = {
 #endif
 };
 
-DEVICE_AND_API_INIT(stts751, DT_INST_LABEL(0), stts751_init,
+DEVICE_DT_INST_DEFINE(0, stts751_init, device_pm_control_nop,
 		    &stts751_data, &stts751_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &stts751_api_funcs);
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index b9bd2b70258..faf798c3dad 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -137,6 +137,6 @@ int sx9500_init(const struct device *dev)
 
 struct sx9500_data sx9500_data;
 
-DEVICE_AND_API_INIT(sx9500, DT_INST_LABEL(0), sx9500_init, &sx9500_data,
+DEVICE_DT_INST_DEFINE(0, sx9500_init, device_pm_control_nop, &sx9500_data,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &sx9500_api_funcs);
diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c
index 383791276a8..0346a66aa1d 100644
--- a/drivers/sensor/th02/th02.c
+++ b/drivers/sensor/th02/th02.c
@@ -142,6 +142,6 @@ static int th02_init(const struct device *dev)
 
 static struct th02_data th02_driver;
 
-DEVICE_AND_API_INIT(th02, DT_INST_LABEL(0), th02_init, &th02_driver,
+DEVICE_DT_INST_DEFINE(0, th02_init, device_pm_control_nop, &th02_driver,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &th02_driver_api);
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index b38785f64c0..b275524ecf1 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/drivers/sensor/ti_hdc/ti_hdc.c
@@ -180,6 +180,6 @@ static int ti_hdc_init(const struct device *dev)
 
 static struct ti_hdc_data ti_hdc_data;
 
-DEVICE_AND_API_INIT(ti_hdc, DT_INST_LABEL(0), ti_hdc_init, &ti_hdc_data,
+DEVICE_DT_INST_DEFINE(0, ti_hdc_init, device_pm_control_nop, &ti_hdc_data,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &ti_hdc_driver_api);
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index 09d03e530d9..eb30a9640db 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/drivers/sensor/tmp007/tmp007.c
@@ -129,7 +129,7 @@ int tmp007_init(const struct device *dev)
 
 struct tmp007_data tmp007_driver;
 
-DEVICE_AND_API_INIT(tmp007, DT_INST_LABEL(0), tmp007_init,
+DEVICE_DT_INST_DEFINE(0, tmp007_init, device_pm_control_nop,
 		    &tmp007_driver,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &tmp007_driver_api);
diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c
index 3071954e45e..8d368d2fba4 100644
--- a/drivers/sensor/tmp112/tmp112.c
+++ b/drivers/sensor/tmp112/tmp112.c
@@ -210,5 +210,5 @@ int tmp112_init(const struct device *dev)
 
 static struct tmp112_data tmp112_driver;
 
-DEVICE_AND_API_INIT(tmp112, DT_INST_LABEL(0), tmp112_init, &tmp112_driver,
+DEVICE_DT_INST_DEFINE(0, tmp112_init, device_pm_control_nop, &tmp112_driver,
 	    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &tmp112_driver_api);
diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c
index 95c989646bc..984138197b7 100644
--- a/drivers/sensor/tmp116/tmp116.c
+++ b/drivers/sensor/tmp116/tmp116.c
@@ -145,6 +145,6 @@ static const struct tmp116_dev_config tmp116_config = {
 	.i2c_addr = DT_INST_REG_ADDR(0),
 };
 
-DEVICE_AND_API_INIT(tmp116, DT_INST_LABEL(0), tmp116_init,
+DEVICE_DT_INST_DEFINE(0, tmp116_init, device_pm_control_nop,
 		    &tmp116_data, &tmp116_config, POST_KERNEL,
 		    CONFIG_SENSOR_INIT_PRIORITY, &tmp116_driver_api);
diff --git a/drivers/sensor/vcnl4040/vcnl4040.c b/drivers/sensor/vcnl4040/vcnl4040.c
index a9dfeed795f..bb06f18df4f 100644
--- a/drivers/sensor/vcnl4040/vcnl4040.c
+++ b/drivers/sensor/vcnl4040/vcnl4040.c
@@ -370,6 +370,6 @@ static const struct vcnl4040_config vcnl4040_config = {
 
 static struct vcnl4040_data vcnl4040_data;
 
-DEVICE_DEFINE(vcnl4040, DT_INST_LABEL(0), vcnl4040_init,
+DEVICE_DT_INST_DEFINE(0, vcnl4040_init,
 	      vcnl4040_device_ctrl, &vcnl4040_data, &vcnl4040_config,
 	      POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &vcnl4040_driver_api);
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index cf47bc5f151..9dfeb865d4e 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/drivers/sensor/vl53l0x/vl53l0x.c
@@ -283,6 +283,6 @@ static int vl53l0x_init(const struct device *dev)
 
 static struct vl53l0x_data vl53l0x_driver;
 
-DEVICE_AND_API_INIT(vl53l0x, DT_INST_LABEL(0), vl53l0x_init, &vl53l0x_driver,
+DEVICE_DT_INST_DEFINE(0, vl53l0x_init, device_pm_control_nop, &vl53l0x_driver,
 		    NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
 		    &vl53l0x_api_funcs);
diff --git a/drivers/sensor/wsen_itds/itds.c b/drivers/sensor/wsen_itds/itds.c
index 65f04528830..298608b1712 100644
--- a/drivers/sensor/wsen_itds/itds.c
+++ b/drivers/sensor/wsen_itds/itds.c
@@ -401,7 +401,7 @@ static const struct itds_device_config itds_config_##idx = {		\
 	.def_op_mode = DT_ENUM_IDX(DT_DRV_INST(idx), op_mode),		\
 };									\
 									\
-DEVICE_AND_API_INIT(itds_##idx, DT_INST_LABEL(idx), itds_init,		\
+DEVICE_DT_INST_DEFINE(idx, itds_init, device_pm_control_nop,		\
 		    &itds_data_##idx, &itds_config_##idx,		\
 		    POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,		\
 		    &itds_api);						\