| Message ID | 1569308828-8320-2-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ebe66ded6d4cdf6fb48d8fec56c73acc631953e8 |
| Headers | show |
| Series | [1/3] watchdog: imx2_wdt: Remove unnecessary blank line | expand |
On Tue, Sep 24, 2019 at 03:07:07PM +0800, Anson Huang wrote: > Use __maybe_unused for power management related functions instead > of #if CONFIG_PM_SLEEP to simply the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/imx2_wdt.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c > index 6711b4e..034f32c 100644 > --- a/drivers/watchdog/imx2_wdt.c > +++ b/drivers/watchdog/imx2_wdt.c > @@ -358,9 +358,8 @@ static void imx2_wdt_shutdown(struct platform_device *pdev) > } > } > > -#ifdef CONFIG_PM_SLEEP > /* Disable watchdog if it is active or non-active but still running */ > -static int imx2_wdt_suspend(struct device *dev) > +static int __maybe_unused imx2_wdt_suspend(struct device *dev) > { > struct watchdog_device *wdog = dev_get_drvdata(dev); > struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); > @@ -381,7 +380,7 @@ static int imx2_wdt_suspend(struct device *dev) > } > > /* Enable watchdog and configure it if necessary */ > -static int imx2_wdt_resume(struct device *dev) > +static int __maybe_unused imx2_wdt_resume(struct device *dev) > { > struct watchdog_device *wdog = dev_get_drvdata(dev); > struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); > @@ -406,7 +405,6 @@ static int imx2_wdt_resume(struct device *dev) > > return 0; > } > -#endif > > static SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, > imx2_wdt_resume); > -- > 2.7.4 >
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 6711b4e..034f32c 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -358,9 +358,8 @@ static void imx2_wdt_shutdown(struct platform_device *pdev) } } -#ifdef CONFIG_PM_SLEEP /* Disable watchdog if it is active or non-active but still running */ -static int imx2_wdt_suspend(struct device *dev) +static int __maybe_unused imx2_wdt_suspend(struct device *dev) { struct watchdog_device *wdog = dev_get_drvdata(dev); struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); @@ -381,7 +380,7 @@ static int imx2_wdt_suspend(struct device *dev) } /* Enable watchdog and configure it if necessary */ -static int imx2_wdt_resume(struct device *dev) +static int __maybe_unused imx2_wdt_resume(struct device *dev) { struct watchdog_device *wdog = dev_get_drvdata(dev); struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); @@ -406,7 +405,6 @@ static int imx2_wdt_resume(struct device *dev) return 0; } -#endif static SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, imx2_wdt_resume);
Use __maybe_unused for power management related functions instead of #if CONFIG_PM_SLEEP to simply the code. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- drivers/watchdog/imx2_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)