Re: [PATCH 1/3] ACPI: watchdog: remove unnecessary CONFIG_PM_SLEEP

From: Guenter Roeck
Date: Thu Oct 29 2020 - 09:02:50 EST


On 10/29/20 12:53 AM, Coiby Xu wrote:
> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
Not really.

> Signed-off-by: Coiby Xu <coiby.xu@xxxxxxxxx>
> ---
> drivers/watchdog/wdat_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index 3065dd670a18..0d912ceb2ecd 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -465,7 +465,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)

You would have to add __maybe_unused here for this to work as intended.

Guenter

> {
> struct wdat_wdt *wdat = dev_get_drvdata(dev);
> @@ -526,7 +525,6 @@ 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,
>