lkml.org 
[lkml]   [2022]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/8] watchdog: dw_wdt: Remove #ifdef guards for PM related functions
On Tue, Jun 28, 2022 at 08:34:43PM +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@crapouillou.net>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/watchdog/dw_wdt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index cd578843277e..060dae67d852 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -375,7 +375,6 @@ static irqreturn_t dw_wdt_irq(int irq, void *devid)
> return IRQ_HANDLED;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int dw_wdt_suspend(struct device *dev)
> {
> struct dw_wdt *dw_wdt = dev_get_drvdata(dev);
> @@ -410,9 +409,8 @@ static int dw_wdt_resume(struct device *dev)
>
> return 0;
> }
> -#endif /* CONFIG_PM_SLEEP */
>
> -static SIMPLE_DEV_PM_OPS(dw_wdt_pm_ops, dw_wdt_suspend, dw_wdt_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(dw_wdt_pm_ops, dw_wdt_suspend, dw_wdt_resume);
>
> /*
> * In case if DW WDT IP core is synthesized with fixed TOP feature disabled the
> @@ -710,7 +708,7 @@ static struct platform_driver dw_wdt_driver = {
> .driver = {
> .name = "dw_wdt",
> .of_match_table = of_match_ptr(dw_wdt_of_match),
> - .pm = &dw_wdt_pm_ops,
> + .pm = pm_sleep_ptr(&dw_wdt_pm_ops),
> },
> };
>
> --
> 2.35.1
>

\
 
 \ /
  Last update: 2022-06-28 22:14    [W:0.121 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site