From 621d1d45f2fc5af51671d2cec920f7e51323e6a8 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 28 Apr 2021 12:07:15 +0200 Subject: [PATCH] drivers: watchdog: 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/watchdog/wdt_cc32xx.c | 2 +- drivers/watchdog/wdt_cmsdk_apb.c | 2 +- drivers/watchdog/wdt_esp32.c | 2 +- drivers/watchdog/wdt_gecko.c | 2 +- drivers/watchdog/wdt_iwdg_stm32.c | 2 +- drivers/watchdog/wdt_mchp_xec.c | 2 +- drivers/watchdog/wdt_mcux_imx_wdog.c | 2 +- drivers/watchdog/wdt_mcux_wdog.c | 2 +- drivers/watchdog/wdt_mcux_wdog32.c | 2 +- drivers/watchdog/wdt_mcux_wwdt.c | 2 +- drivers/watchdog/wdt_npcx.c | 2 +- drivers/watchdog/wdt_nrfx.c | 2 +- drivers/watchdog/wdt_sam.c | 2 +- drivers/watchdog/wdt_sam0.c | 2 +- drivers/watchdog/wdt_sifive.c | 2 +- drivers/watchdog/wdt_wwdg_stm32.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/wdt_cc32xx.c b/drivers/watchdog/wdt_cc32xx.c index 85c7e21b505..2319fcc7639 100644 --- a/drivers/watchdog/wdt_cc32xx.c +++ b/drivers/watchdog/wdt_cc32xx.c @@ -189,7 +189,7 @@ static const struct wdt_driver_api wdt_cc32xx_api = { }; \ \ DEVICE_DT_INST_DEFINE(index, \ - &wdt_cc32xx_init, device_pm_control_nop, \ + &wdt_cc32xx_init, NULL, \ &wdt_cc32xx_data_##index, &wdt_cc32xx_cfg_##index, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &wdt_cc32xx_api); diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c index ed5ebcf0024..2324d94ea81 100644 --- a/drivers/watchdog/wdt_cmsdk_apb.c +++ b/drivers/watchdog/wdt_cmsdk_apb.c @@ -201,7 +201,7 @@ static int wdog_cmsdk_apb_init(const struct device *dev) DEVICE_DT_INST_DEFINE(0, wdog_cmsdk_apb_init, - device_pm_control_nop, + NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdog_cmsdk_apb_api); diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c index 3fade39118a..643b1a23ead 100644 --- a/drivers/watchdog/wdt_esp32.c +++ b/drivers/watchdog/wdt_esp32.c @@ -252,7 +252,7 @@ static const struct wdt_driver_api wdt_api = { \ DEVICE_DT_INST_DEFINE(idx, \ wdt_esp32_init, \ - device_pm_control_nop, \ + NULL, \ &wdt##idx##_data, \ &wdt_esp32_config##idx, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c index b99b26fdfe1..9d90700cbeb 100644 --- a/drivers/watchdog/wdt_gecko.c +++ b/drivers/watchdog/wdt_gecko.c @@ -293,7 +293,7 @@ static const struct wdt_driver_api wdt_gecko_driver_api = { static struct wdt_gecko_data wdt_gecko_data_##index; \ \ DEVICE_DT_INST_DEFINE(index, \ - &wdt_gecko_init, device_pm_control_nop, \ + &wdt_gecko_init, NULL, \ &wdt_gecko_data_##index, \ &wdt_gecko_cfg_##index, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c index 959e10ee36b..b0bd45d26cb 100644 --- a/drivers/watchdog/wdt_iwdg_stm32.c +++ b/drivers/watchdog/wdt_iwdg_stm32.c @@ -196,7 +196,7 @@ static struct iwdg_stm32_data iwdg_stm32_dev_data = { .Instance = (IWDG_TypeDef *)DT_INST_REG_ADDR(0) }; -DEVICE_DT_INST_DEFINE(0, iwdg_stm32_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, iwdg_stm32_init, NULL, &iwdg_stm32_dev_data, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &iwdg_stm32_api); diff --git a/drivers/watchdog/wdt_mchp_xec.c b/drivers/watchdog/wdt_mchp_xec.c index 97b96bd0895..95460644853 100644 --- a/drivers/watchdog/wdt_mchp_xec.c +++ b/drivers/watchdog/wdt_mchp_xec.c @@ -175,7 +175,7 @@ static int wdt_xec_init(const struct device *dev) static struct wdt_xec_data wdt_xec_dev_data; -DEVICE_DT_INST_DEFINE(0, wdt_xec_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wdt_xec_init, NULL, &wdt_xec_dev_data, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_xec_api); diff --git a/drivers/watchdog/wdt_mcux_imx_wdog.c b/drivers/watchdog/wdt_mcux_imx_wdog.c index 059e5b57296..2eee0bc9225 100644 --- a/drivers/watchdog/wdt_mcux_imx_wdog.c +++ b/drivers/watchdog/wdt_mcux_imx_wdog.c @@ -153,7 +153,7 @@ static struct mcux_wdog_data mcux_wdog_data; DEVICE_DT_INST_DEFINE(0, &mcux_wdog_init, - device_pm_control_nop, + NULL, &mcux_wdog_data, &mcux_wdog_config, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wdog_api); diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c index 2baca81416a..6b5c3ff22e4 100644 --- a/drivers/watchdog/wdt_mcux_wdog.c +++ b/drivers/watchdog/wdt_mcux_wdog.c @@ -171,7 +171,7 @@ static struct mcux_wdog_data mcux_wdog_data_0; DEVICE_DT_INST_DEFINE(0, &mcux_wdog_init, - device_pm_control_nop, + NULL, &mcux_wdog_data_0, &mcux_wdog_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wdog_api); diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c index cdf7d06cf1b..1b2c83640f2 100644 --- a/drivers/watchdog/wdt_mcux_wdog32.c +++ b/drivers/watchdog/wdt_mcux_wdog32.c @@ -203,7 +203,7 @@ static const struct mcux_wdog32_config mcux_wdog32_config_0 = { static struct mcux_wdog32_data mcux_wdog32_data_0; DEVICE_DT_INST_DEFINE(0, &mcux_wdog32_init, - device_pm_control_nop, &mcux_wdog32_data_0, + NULL, &mcux_wdog32_data_0, &mcux_wdog32_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wdog32_api); diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c index 207f5c4c26e..90ee877d1ed 100644 --- a/drivers/watchdog/wdt_mcux_wwdt.c +++ b/drivers/watchdog/wdt_mcux_wwdt.c @@ -175,7 +175,7 @@ static const struct mcux_wwdt_config mcux_wwdt_config_0 = { static struct mcux_wwdt_data mcux_wwdt_data_0; DEVICE_DT_INST_DEFINE(0, &mcux_wwdt_init, - device_pm_control_nop, &mcux_wwdt_data_0, + NULL, &mcux_wwdt_data_0, &mcux_wwdt_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wwdt_api); diff --git a/drivers/watchdog/wdt_npcx.c b/drivers/watchdog/wdt_npcx.c index 69eb46916cc..cf408d42184 100644 --- a/drivers/watchdog/wdt_npcx.c +++ b/drivers/watchdog/wdt_npcx.c @@ -349,7 +349,7 @@ static const struct wdt_npcx_config wdt_npcx_cfg_0 = { static struct wdt_npcx_data wdt_npcx_data_0; -DEVICE_DT_INST_DEFINE(0, wdt_npcx_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wdt_npcx_init, NULL, &wdt_npcx_data_0, &wdt_npcx_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c index dda31970a40..b03270ee859 100644 --- a/drivers/watchdog/wdt_nrfx.c +++ b/drivers/watchdog/wdt_nrfx.c @@ -183,7 +183,7 @@ static void wdt_event_handler(const struct device *dev) }; \ DEVICE_DT_DEFINE(WDT(idx), \ wdt_##idx##_init, \ - device_pm_control_nop, \ + NULL, \ &wdt_##idx##_data, \ &wdt_##idx##z_config, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c index 44866ee3f21..00f57e876e3 100644 --- a/drivers/watchdog/wdt_sam.c +++ b/drivers/watchdog/wdt_sam.c @@ -249,6 +249,6 @@ static int wdt_sam_init(const struct device *dev) return 0; } -DEVICE_DT_INST_DEFINE(0, wdt_sam_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wdt_sam_init, NULL, &wdt_sam_data, &wdt_sam_cfg, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam_api); diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c index 52f444b79ec..ac94f6342e4 100644 --- a/drivers/watchdog/wdt_sam0.c +++ b/drivers/watchdog/wdt_sam0.c @@ -278,6 +278,6 @@ static int wdt_sam0_init(const struct device *dev) static struct wdt_sam0_dev_data wdt_sam0_data; -DEVICE_DT_INST_DEFINE(0, wdt_sam0_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wdt_sam0_init, NULL, &wdt_sam0_data, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam0_api); diff --git a/drivers/watchdog/wdt_sifive.c b/drivers/watchdog/wdt_sifive.c index 53f44071ac9..9b2ec7a3546 100644 --- a/drivers/watchdog/wdt_sifive.c +++ b/drivers/watchdog/wdt_sifive.c @@ -282,6 +282,6 @@ static const struct wdt_sifive_device_config wdt_sifive_cfg = { .regs = DT_INST_REG_ADDR(0), }; -DEVICE_DT_INST_DEFINE(0, wdt_sifive_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wdt_sifive_init, NULL, &wdt_sifive_data, &wdt_sifive_cfg, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sifive_api); diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c index 5c89b42a017..c72dfa4bd5f 100644 --- a/drivers/watchdog/wdt_wwdg_stm32.c +++ b/drivers/watchdog/wdt_wwdg_stm32.c @@ -289,7 +289,7 @@ static struct wwdg_stm32_config wwdg_stm32_dev_config = { .Instance = (WWDG_TypeDef *)DT_INST_REG_ADDR(0), }; -DEVICE_DT_INST_DEFINE(0, wwdg_stm32_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, wwdg_stm32_init, NULL, &wwdg_stm32_dev_data, &wwdg_stm32_dev_config, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wwdg_stm32_api);