On Tue, Jun 28, 2022 at 08:34:49PM +0100, Paul Cercueil wrote:
> Use the new NOIRQ_SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr() macros to
> handle the .suspend/.resume callbacks.
>
> These macros allow the suspend and resume functions to be automatically
> dropped by the compiler when CONFIG_SUSPEND is disabled, without having
> to use #ifdef guards. Not using #ifdef guards means that the code is
> always compiled independently of any Kconfig option, and thanks to that
> bugs and regressions are easier to catch.
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/wdat_wdt.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index e6f95e99156d..aeadaa07c891 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -467,7 +467,6 @@ static int wdat_wdt_probe(struct platform_device *pdev)
> return devm_watchdog_register_device(dev, &wdat->wdd);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int wdat_wdt_suspend_noirq(struct device *dev)
> {
> struct wdat_wdt *wdat = dev_get_drvdata(dev);
> @@ -528,18 +527,16 @@ static int wdat_wdt_resume_noirq(struct device *dev)
>
> return wdat_wdt_start(&wdat->wdd);
> }
> -#endif
>
> static const struct dev_pm_ops wdat_wdt_pm_ops = {
> - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq,
> - wdat_wdt_resume_noirq)
> + NOIRQ_SYSTEM_SLEEP_PM_OPS(wdat_wdt_suspend_noirq, wdat_wdt_resume_noirq)
> };
>
> static struct platform_driver wdat_wdt_driver = {
> .probe = wdat_wdt_probe,
> .driver = {
> .name = "wdat_wdt",
> - .pm = &wdat_wdt_pm_ops,
> + .pm = pm_sleep_ptr(&wdat_wdt_pm_ops),
> },
> };
>
> --
> 2.35.1
>
