From 510aacc45d571b88c8141954f7e54896091a7a40 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 28 Apr 2021 10:02:28 +0200 Subject: [PATCH] drivers: adc: remove usage of device_pm_control_nop device_pm_control_nop is now deprecated in favour of NULL. Signed-off-by: Gerard Marull-Paretas --- drivers/adc/adc_cc32xx.c | 6 +++--- drivers/adc/adc_ite_it8xxx2.c | 2 +- drivers/adc/adc_lmp90xxx.c | 2 +- drivers/adc/adc_mchp_xec.c | 2 +- drivers/adc/adc_mcp320x.c | 2 +- drivers/adc/adc_mcux_adc12.c | 2 +- drivers/adc/adc_mcux_adc16.c | 2 +- drivers/adc/adc_mcux_lpadc.c | 2 +- drivers/adc/adc_npcx.c | 2 +- drivers/adc/adc_nrfx_adc.c | 2 +- drivers/adc/adc_nrfx_saadc.c | 2 +- drivers/adc/adc_sam0.c | 2 +- drivers/adc/adc_sam_afec.c | 2 +- drivers/adc/adc_stm32.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/adc/adc_cc32xx.c b/drivers/adc/adc_cc32xx.c index 696604179f4..9c5a5d2f585 100644 --- a/drivers/adc/adc_cc32xx.c +++ b/drivers/adc/adc_cc32xx.c @@ -311,9 +311,9 @@ static const struct adc_driver_api cc32xx_driver_api = { }; \ \ DEVICE_DT_INST_DEFINE(index, \ - &adc_cc32xx_init, device_pm_control_nop, \ - &adc_cc32xx_data_##index, &adc_cc32xx_cfg_##index, \ - POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ + &adc_cc32xx_init, NULL, &adc_cc32xx_data_##index, \ + &adc_cc32xx_cfg_##index, POST_KERNEL, \ + CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &cc32xx_driver_api); \ \ static void adc_cc32xx_cfg_func_##index(void) \ diff --git a/drivers/adc/adc_ite_it8xxx2.c b/drivers/adc/adc_ite_it8xxx2.c index 98374751c9a..a505410e415 100644 --- a/drivers/adc/adc_ite_it8xxx2.c +++ b/drivers/adc/adc_ite_it8xxx2.c @@ -329,7 +329,7 @@ static struct adc_it8xxx2_data adc_it8xxx2_data_0 = { ADC_CONTEXT_INIT_SYNC(adc_it8xxx2_data_0, ctx), }; DEVICE_DT_INST_DEFINE(0, adc_it8xxx2_init, - device_pm_control_nop, + NULL, &adc_it8xxx2_data_0, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c index b68fa942da9..7cbf61f2374 100644 --- a/drivers/adc/adc_lmp90xxx.c +++ b/drivers/adc/adc_lmp90xxx.c @@ -1130,7 +1130,7 @@ static const struct adc_driver_api lmp90xxx_adc_api = { .channels = ch, \ }; \ DEVICE_DT_DEFINE(DT_INST_LMP90XXX(n, t), \ - &lmp90xxx_init, device_pm_control_nop, \ + &lmp90xxx_init, NULL, \ &lmp##t##_data_##n, \ &lmp##t##_config_##n, POST_KERNEL, \ CONFIG_ADC_LMP90XXX_INIT_PRIORITY, \ diff --git a/drivers/adc/adc_mchp_xec.c b/drivers/adc/adc_mchp_xec.c index a4915b74d8c..704450f0435 100644 --- a/drivers/adc/adc_mchp_xec.c +++ b/drivers/adc/adc_mchp_xec.c @@ -307,7 +307,7 @@ static struct adc_xec_data adc_xec_dev_data_0 = { ADC_CONTEXT_INIT_SYNC(adc_xec_dev_data_0, ctx), }; -DEVICE_DT_INST_DEFINE(0, adc_xec_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, adc_xec_init, NULL, &adc_xec_dev_data_0, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &adc_xec_api); diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c index 77958236e59..8a458e80162 100644 --- a/drivers/adc/adc_mcp320x.c +++ b/drivers/adc/adc_mcp320x.c @@ -357,7 +357,7 @@ static const struct adc_driver_api mcp320x_adc_api = { .channels = ch, \ }; \ DEVICE_DT_DEFINE(INST_DT_MCP320X(n, t), \ - &mcp320x_init, device_pm_control_nop, \ + &mcp320x_init, NULL, \ &mcp##t##_data_##n, \ &mcp##t##_config_##n, POST_KERNEL, \ CONFIG_ADC_MCP320X_INIT_PRIORITY, \ diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c index 296ea90bed1..dca7cae3cc3 100644 --- a/drivers/adc/adc_mcux_adc12.c +++ b/drivers/adc/adc_mcux_adc12.c @@ -284,7 +284,7 @@ static const struct adc_driver_api mcux_adc12_driver_api = { }; \ \ DEVICE_DT_INST_DEFINE(n, &mcux_adc12_init, \ - device_pm_control_nop, &mcux_adc12_data_##n,\ + NULL, &mcux_adc12_data_##n, \ &mcux_adc12_config_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_adc12_driver_api); \ diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c index 4c219a80af5..03129be25e4 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -294,7 +294,7 @@ static const struct adc_driver_api mcux_adc16_driver_api = { }; \ \ DEVICE_DT_INST_DEFINE(n, &mcux_adc16_init, \ - device_pm_control_nop, &mcux_adc16_data_##n,\ + NULL, &mcux_adc16_data_##n, \ &mcux_adc16_config_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_adc16_driver_api); \ diff --git a/drivers/adc/adc_mcux_lpadc.c b/drivers/adc/adc_mcux_lpadc.c index c4f1cc29f08..d984a4fe909 100644 --- a/drivers/adc/adc_mcux_lpadc.c +++ b/drivers/adc/adc_mcux_lpadc.c @@ -394,7 +394,7 @@ static const struct adc_driver_api mcux_lpadc_driver_api = { }; \ \ DEVICE_DT_INST_DEFINE(n, \ - &mcux_lpadc_init, device_pm_control_nop, &mcux_lpadc_data_##n, \ + &mcux_lpadc_init, NULL, &mcux_lpadc_data_##n, \ &mcux_lpadc_config_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_lpadc_driver_api); \ diff --git a/drivers/adc/adc_npcx.c b/drivers/adc/adc_npcx.c index 092d5696f45..9398357bba2 100644 --- a/drivers/adc/adc_npcx.c +++ b/drivers/adc/adc_npcx.c @@ -322,7 +322,7 @@ static struct adc_npcx_data adc_npcx_data_0 = { }; DEVICE_DT_INST_DEFINE(0, - adc_npcx_init, device_pm_control_nop, + adc_npcx_init, NULL, &adc_npcx_data_0, &adc_npcx_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c index b5e03c4c504..20c9ab97872 100644 --- a/drivers/adc/adc_nrfx_adc.c +++ b/drivers/adc/adc_nrfx_adc.c @@ -290,7 +290,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = { BUILD_ASSERT((inst) == 0, \ "multiple instances not supported"); \ DEVICE_DT_INST_DEFINE(0, \ - init_adc, device_pm_control_nop, NULL, NULL,\ + init_adc, NULL, NULL, NULL, \ POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &adc_nrfx_driver_api); diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c index ca8f3f1b8dc..e803b074e18 100644 --- a/drivers/adc/adc_nrfx_saadc.c +++ b/drivers/adc/adc_nrfx_saadc.c @@ -429,7 +429,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = { "multiple instances not supported"); \ DEVICE_DT_INST_DEFINE(0, \ init_saadc, \ - device_pm_control_nop, \ + NULL, \ NULL, \ NULL, \ POST_KERNEL, \ diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c index f229e3a8899..c2bdf3ce1ca 100644 --- a/drivers/adc/adc_sam0.c +++ b/drivers/adc/adc_sam0.c @@ -602,7 +602,7 @@ do { \ ADC_CONTEXT_INIT_LOCK(adc_sam_data_##n, ctx), \ ADC_CONTEXT_INIT_SYNC(adc_sam_data_##n, ctx), \ }; \ - DEVICE_DT_INST_DEFINE(n, adc_sam0_init, device_pm_control_nop, \ + DEVICE_DT_INST_DEFINE(n, adc_sam0_init, NULL, \ &adc_sam_data_##n, \ &adc_sam_cfg_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index 4ec52637ce8..cecec1e377a 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -365,7 +365,7 @@ static void adc_sam_isr(const struct device *dev) ADC_CONTEXT_INIT_SYNC(adc##n##_sam_data, ctx), \ }; \ \ - DEVICE_DT_INST_DEFINE(n, adc_sam_init, device_pm_control_nop, \ + DEVICE_DT_INST_DEFINE(n, adc_sam_init, NULL, \ &adc##n##_sam_data, \ &adc##n##_sam_cfg, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index 7f634b15e35..9a1f77adaa9 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -785,7 +785,7 @@ static struct adc_stm32_data adc_stm32_data_##index = { \ }; \ \ DEVICE_DT_INST_DEFINE(index, \ - &adc_stm32_init, device_pm_control_nop, \ + &adc_stm32_init, NULL, \ &adc_stm32_data_##index, &adc_stm32_cfg_##index, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &api_stm32_driver_api); \