michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: watchdog: remove usage of device_pm_control_nop

Browse source 
device_pm_control_nop is now deprecated in favour of NULL.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-04-28 12:07:15 +02:00 • committed by Anas Nashif
commit 621d1d45f2
16 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/watchdog/wdt_cc32xx.c
View file

@ -189,7 +189,7 @@ static const struct wdt_driver_api wdt_cc32xx_api = {
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(index, \ DEVICE_DT_INST_DEFINE(index, \
&wdt_cc32xx_init, device_pm_control_nop, \ &wdt_cc32xx_init, NULL, \
&wdt_cc32xx_data_##index, &wdt_cc32xx_cfg_##index, \ &wdt_cc32xx_data_##index, &wdt_cc32xx_cfg_##index, \
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
&wdt_cc32xx_api); &wdt_cc32xx_api);

2
drivers/watchdog/wdt_cmsdk_apb.c
View file

@ -201,7 +201,7 @@ static int wdog_cmsdk_apb_init(const struct device *dev)
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
wdog_cmsdk_apb_init, wdog_cmsdk_apb_init,
device_pm_control_nop, NULL,
NULL, NULL, NULL, NULL,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&wdog_cmsdk_apb_api); &wdog_cmsdk_apb_api);

2
drivers/watchdog/wdt_esp32.c
View file

@ -252,7 +252,7 @@ static const struct wdt_driver_api wdt_api = {
\ \
DEVICE_DT_INST_DEFINE(idx, \ DEVICE_DT_INST_DEFINE(idx, \
wdt_esp32_init, \ wdt_esp32_init, \
device_pm_control_nop, \ NULL, \
&wdt##idx##_data, \ &wdt##idx##_data, \
&wdt_esp32_config##idx, \ &wdt_esp32_config##idx, \
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

2
drivers/watchdog/wdt_gecko.c
View file

@ -293,7 +293,7 @@ static const struct wdt_driver_api wdt_gecko_driver_api = {
static struct wdt_gecko_data wdt_gecko_data_##index; \ static struct wdt_gecko_data wdt_gecko_data_##index; \
\ \
DEVICE_DT_INST_DEFINE(index, \ DEVICE_DT_INST_DEFINE(index, \
&wdt_gecko_init, device_pm_control_nop, \ &wdt_gecko_init, NULL, \
&wdt_gecko_data_##index, \ &wdt_gecko_data_##index, \
&wdt_gecko_cfg_##index, POST_KERNEL, \ &wdt_gecko_cfg_##index, POST_KERNEL, \
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \

2
drivers/watchdog/wdt_iwdg_stm32.c
View file

@ -196,7 +196,7 @@ static struct iwdg_stm32_data iwdg_stm32_dev_data = {
.Instance = (IWDG_TypeDef *)DT_INST_REG_ADDR(0) .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, &iwdg_stm32_dev_data, NULL,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&iwdg_stm32_api); &iwdg_stm32_api);

2
drivers/watchdog/wdt_mchp_xec.c
View file

@ -175,7 +175,7 @@ static int wdt_xec_init(const struct device *dev)
static struct wdt_xec_data wdt_xec_dev_data; 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, &wdt_xec_dev_data, NULL,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&wdt_xec_api); &wdt_xec_api);

2
drivers/watchdog/wdt_mcux_imx_wdog.c
View file

@ -153,7 +153,7 @@ static struct mcux_wdog_data mcux_wdog_data;
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
&mcux_wdog_init, &mcux_wdog_init,
device_pm_control_nop, NULL,
&mcux_wdog_data, &mcux_wdog_config, &mcux_wdog_data, &mcux_wdog_config,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&mcux_wdog_api); &mcux_wdog_api);

2
drivers/watchdog/wdt_mcux_wdog.c
View file

@ -171,7 +171,7 @@ static struct mcux_wdog_data mcux_wdog_data_0;
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
&mcux_wdog_init, &mcux_wdog_init,
device_pm_control_nop, NULL,
&mcux_wdog_data_0, &mcux_wdog_config_0, &mcux_wdog_data_0, &mcux_wdog_config_0,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&mcux_wdog_api); &mcux_wdog_api);

2
drivers/watchdog/wdt_mcux_wdog32.c
View file

@ -203,7 +203,7 @@ static const struct mcux_wdog32_config mcux_wdog32_config_0 = {
static struct mcux_wdog32_data mcux_wdog32_data_0; static struct mcux_wdog32_data mcux_wdog32_data_0;
DEVICE_DT_INST_DEFINE(0, &mcux_wdog32_init, 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, &mcux_wdog32_config_0, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&mcux_wdog32_api); &mcux_wdog32_api);

2
drivers/watchdog/wdt_mcux_wwdt.c
View file

@ -175,7 +175,7 @@ static const struct mcux_wwdt_config mcux_wwdt_config_0 = {
static struct mcux_wwdt_data mcux_wwdt_data_0; static struct mcux_wwdt_data mcux_wwdt_data_0;
DEVICE_DT_INST_DEFINE(0, &mcux_wwdt_init, 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, &mcux_wwdt_config_0, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&mcux_wwdt_api); &mcux_wwdt_api);

2
drivers/watchdog/wdt_npcx.c
View file

@ -349,7 +349,7 @@ static const struct wdt_npcx_config wdt_npcx_cfg_0 = {
static struct wdt_npcx_data wdt_npcx_data_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, &wdt_npcx_data_0, &wdt_npcx_cfg_0,
PRE_KERNEL_1, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,

2
drivers/watchdog/wdt_nrfx.c
View file

@ -183,7 +183,7 @@ static void wdt_event_handler(const struct device *dev)
}; \ }; \
DEVICE_DT_DEFINE(WDT(idx), \ DEVICE_DT_DEFINE(WDT(idx), \
wdt_##idx##_init, \ wdt_##idx##_init, \
device_pm_control_nop, \ NULL, \
&wdt_##idx##_data, \ &wdt_##idx##_data, \
&wdt_##idx##z_config, \ &wdt_##idx##z_config, \
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

2
drivers/watchdog/wdt_sam.c
View file

@ -249,6 +249,6 @@ static int wdt_sam_init(const struct device *dev)
return 0; 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, &wdt_sam_data, &wdt_sam_cfg, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam_api);

2
drivers/watchdog/wdt_sam0.c
View file

@ -278,6 +278,6 @@ static int wdt_sam0_init(const struct device *dev)
static struct wdt_sam0_dev_data wdt_sam0_data; 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, &wdt_sam0_data, NULL, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam0_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam0_api);

2
drivers/watchdog/wdt_sifive.c
View file

@ -282,6 +282,6 @@ static const struct wdt_sifive_device_config wdt_sifive_cfg = {
.regs = DT_INST_REG_ADDR(0), .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, &wdt_sifive_data, &wdt_sifive_cfg, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sifive_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sifive_api);

2
drivers/watchdog/wdt_wwdg_stm32.c
View file

@ -289,7 +289,7 @@ static struct wwdg_stm32_config wwdg_stm32_dev_config = {
.Instance = (WWDG_TypeDef *)DT_INST_REG_ADDR(0), .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, &wwdg_stm32_dev_data, &wwdg_stm32_dev_config,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&wwdg_stm32_api); &wwdg_stm32_api);