On Tue, Jun 28, 2022 at 08:34:45PM +0100, Paul Cercueil wrote:
> Use the new DEFINE_SIMPLE_DEV_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>
> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> Cc: Alim Akhtar <alim.akhtar@xxxxxxxxxxx>
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-samsung-soc@xxxxxxxxxxxxxxx
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/s3c2410_wdt.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index 6db22f2e3a4f..95919392927f 100644
> --- a/drivers/watchdog/s3c2410_wdt.c
> +++ b/drivers/watchdog/s3c2410_wdt.c
> @@ -845,8 +845,6 @@ static void s3c2410wdt_shutdown(struct platform_device *dev)
> s3c2410wdt_stop(&wdt->wdt_device);
> }
>
> -#ifdef CONFIG_PM_SLEEP
> -
> static int s3c2410wdt_suspend(struct device *dev)
> {
> int ret;
> @@ -885,10 +883,9 @@ static int s3c2410wdt_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> -static SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops, s3c2410wdt_suspend,
> - s3c2410wdt_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops,
> + s3c2410wdt_suspend, s3c2410wdt_resume);
>
> static struct platform_driver s3c2410wdt_driver = {
> .probe = s3c2410wdt_probe,
> @@ -897,7 +894,7 @@ static struct platform_driver s3c2410wdt_driver = {
> .id_table = s3c2410_wdt_ids,
> .driver = {
> .name = "s3c2410-wdt",
> - .pm = &s3c2410wdt_pm_ops,
> + .pm = pm_sleep_ptr(&s3c2410wdt_pm_ops),
> .of_match_table = of_match_ptr(s3c2410_wdt_match),
> },
> };
> --
> 2.35.1
>
