On Tue, Apr 26, 2022 at 06:11:45PM +0800, Liu Xinpeng wrote:
> For power management, SET_NOIRQ_SYSTEM_SLEEP_PM_OPS defined for
> CONFIG_PM_SLEEP, will point ->suspend_noirq, ->freeze_noirq and
> ->poweroff_noirq to the same function. Vice versa happens for
> ->resume_noirq, ->thaw_noirq and ->restore_noirq.
>
> Signed-off-by: Liu Xinpeng <liuxp11@xxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/iTCO_wdt.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 3f2f4343644f..34693f11385f 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -596,7 +596,6 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> /*
> * Suspend-to-idle requires this, because it stops the ticks and timekeeping, so
> * the watchdog cannot be pinged while in that state. In ACPI sleep states the
> @@ -604,15 +603,15 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> */
>
> #ifdef CONFIG_ACPI
> -static inline bool need_suspend(void)
> +static inline bool __maybe_unused need_suspend(void)
> {
> return acpi_target_system_state() == ACPI_STATE_S0;
> }
> #else
> -static inline bool need_suspend(void) { return true; }
> +static inline bool __maybe_unused need_suspend(void) { return true; }
> #endif
>
> -static int iTCO_wdt_suspend_noirq(struct device *dev)
> +static int __maybe_unused iTCO_wdt_suspend_noirq(struct device *dev)
> {
> struct iTCO_wdt_private *p = dev_get_drvdata(dev);
> int ret = 0;
> @@ -626,7 +625,7 @@ static int iTCO_wdt_suspend_noirq(struct device *dev)
> return ret;
> }
>
> -static int iTCO_wdt_resume_noirq(struct device *dev)
> +static int __maybe_unused iTCO_wdt_resume_noirq(struct device *dev)
> {
> struct iTCO_wdt_private *p = dev_get_drvdata(dev);
>
> @@ -637,20 +636,15 @@ static int iTCO_wdt_resume_noirq(struct device *dev)
> }
>
> static const struct dev_pm_ops iTCO_wdt_pm = {
> - .suspend_noirq = iTCO_wdt_suspend_noirq,
> - .resume_noirq = iTCO_wdt_resume_noirq,
> + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(iTCO_wdt_suspend_noirq,
> + iTCO_wdt_resume_noirq)
> };
>
> -#define ITCO_WDT_PM_OPS (&iTCO_wdt_pm)
> -#else
> -#define ITCO_WDT_PM_OPS NULL
> -#endif /* CONFIG_PM_SLEEP */
> -
> static struct platform_driver iTCO_wdt_driver = {
> .probe = iTCO_wdt_probe,
> .driver = {
> .name = DRV_NAME,
> - .pm = ITCO_WDT_PM_OPS,
> + .pm = &iTCO_wdt_pm,
> },
> };
>
> --
> 2.23.0
>
