On Tue, Jun 28, 2022 at 08:34:42PM +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: Florian Fainelli <f.fainelli@xxxxxxxxx>
> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/bcm7038_wdt.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c
> index 1ffcf6aca6ae..9388838899ac 100644
> --- a/drivers/watchdog/bcm7038_wdt.c
> +++ b/drivers/watchdog/bcm7038_wdt.c
> @@ -192,7 +192,6 @@ static int bcm7038_wdt_probe(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int bcm7038_wdt_suspend(struct device *dev)
> {
> struct bcm7038_watchdog *wdt = dev_get_drvdata(dev);
> @@ -212,10 +211,9 @@ static int bcm7038_wdt_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> -static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend,
> - bcm7038_wdt_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops,
> + bcm7038_wdt_suspend, bcm7038_wdt_resume);
>
> static const struct of_device_id bcm7038_wdt_match[] = {
> { .compatible = "brcm,bcm6345-wdt" },
> @@ -236,7 +234,7 @@ static struct platform_driver bcm7038_wdt_driver = {
> .driver = {
> .name = "bcm7038-wdt",
> .of_match_table = bcm7038_wdt_match,
> - .pm = &bcm7038_wdt_pm_ops,
> + .pm = pm_sleep_ptr(&bcm7038_wdt_pm_ops),
> }
> };
> module_platform_driver(bcm7038_wdt_driver);
> --
> 2.35.1
>
