watchdog: imx2_wdt: Remove __maybe_unused notations
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/2 watchdog: imx2_wdt: Remove __maybe_unused notations
From: Fabio Estevam <[email protected]>
Use the 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 __maybe_unused notation.
--- drivers/watchdog/imx2_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/watchdog/imx2_wdt.c +5 -5
@@ -379,7 +379,7 @@ static void imx2_wdt_shutdown(struct platform_device *pdev) }/* Disable watchdog if it is active or non-active but still running */ -static int __maybe_unused imx2_wdt_suspend (struct device *dev) +static int imx2_wdt_suspend (struct device *dev) {struct watchdog_device *wdog =dev_get_drvdata (dev);struct imx2_wdt_device *wdev =watchdog_get_drvdata (wdog);
@@ -404,7 +404,7 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev) }/* Enable watchdog and configure it if necessary */ -static int __maybe_unused imx2_wdt_resume (struct device *dev) +static int imx2_wdt_resume (struct device *dev) {struct watchdog_device *wdog =dev_get_drvdata (dev);struct imx2_wdt_device *wdev =watchdog_get_drvdata (wdog);
@@ -435,8 +435,8 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, - imx2_wdt_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, + imx2_wdt_resume);static struct imx2_wdt_data imx_wdt = { .wdw_supported = true,
@@ -476,7 +476,7 @@ static struct platform_driver imx2_wdt_driver = { .shutdown = imx2_wdt_shutdown, .driver = { .name = DRIVER_NAME, - .pm = &imx2_wdt_pm_ops, + .pm = pm_sleep_ptr(&imx2_wdt_pm_ops), .of_match_table = imx2_wdt_dt_ids, }, };
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH 2/2 watchdog: imx_sc_wdt: Remove __maybe_unused notations
From: Fabio Estevam <[email protected]>
Use the 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 __maybe_unused notation.
--- drivers/watchdog/imx_sc_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/watchdog/imx_sc_wdt.c +5 -5
@@ -216,7 +216,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)return devm_watchdog_register_device (dev, wdog); } -static int __maybe_unused imx_sc_wdt_suspend (struct device *dev) +static int imx_sc_wdt_suspend (struct device *dev) {struct imx_sc_wdt_device *imx_sc_wdd =dev_get_drvdata (dev);
@@ -226,7 +226,7 @@ static int __maybe_unused imx_sc_wdt_suspend(struct device *dev)return 0 ; } -static int __maybe_unused imx_sc_wdt_resume (struct device *dev) +static int imx_sc_wdt_resume (struct device *dev) {struct imx_sc_wdt_device *imx_sc_wdd =dev_get_drvdata (dev);
@@ -236,8 +236,8 @@ static int __maybe_unused imx_sc_wdt_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops, - imx_sc_wdt_suspend, imx_sc_wdt_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops, imx_sc_wdt_suspend, + imx_sc_wdt_resume);static const struct of_device_id imx_sc_wdt_dt_ids[] = { { .compatible ="fsl,imx-sc-wdt" , },
@@ -250,7 +250,7 @@ static struct platform_driver imx_sc_wdt_driver = { .driver = { .name = "imx-sc-wdt", .of_match_table = imx_sc_wdt_dt_ids, - .pm = &imx_sc_wdt_pm_ops, + .pm = pm_sleep_ptr(&imx_sc_wdt_pm_ops), }, };module_platform_driver (imx_sc_wdt_driver);
Signature · 1 line
2.34.1
Re: [PATCH 2/2] watchdog: imx_sc_wdt: Remove __maybe_unused notations
Quoted 10 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Use the
DEFINE_SIMPLE_DEV_PM_OPS()andpm_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_SUSPENDis disabled, without having to use__maybe_unusednotation.Signed-off-by Fabio Estevam <[email protected]>
Quoted 10 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Use the
DEFINE_SIMPLE_DEV_PM_OPS()andpm_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_SUSPENDis disabled, without having to use__maybe_unusednotation.Signed-off-by Fabio Estevam <[email protected]>