On Wed, Jul 09, 2025 at 09:08:05PM +0200, Geert Uytterhoeven wrote:
> Convert the Renesas WDT watchdog driver from SIMPLE_DEV_PM_OPS() to
> DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr(). This lets us drop the
> __maybe_unused annotations from its suspend and resume callbacks, and
> reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/renesas_wdt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
> index c0b2a9c5250dd721..97bcd32bade52131 100644
> --- a/drivers/watchdog/renesas_wdt.c
> +++ b/drivers/watchdog/renesas_wdt.c
> @@ -300,7 +300,7 @@ static void rwdt_remove(struct platform_device *pdev)
> pm_runtime_disable(&pdev->dev);
> }
>
> -static int __maybe_unused rwdt_suspend(struct device *dev)
> +static int rwdt_suspend(struct device *dev)
> {
> struct rwdt_priv *priv = dev_get_drvdata(dev);
>
> @@ -310,7 +310,7 @@ static int __maybe_unused rwdt_suspend(struct device *dev)
> return 0;
> }
>
> -static int __maybe_unused rwdt_resume(struct device *dev)
> +static int rwdt_resume(struct device *dev)
> {
> struct rwdt_priv *priv = dev_get_drvdata(dev);
>
> @@ -320,7 +320,7 @@ static int __maybe_unused rwdt_resume(struct device *dev)
> return 0;
> }
>
> -static SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);
>
> static const struct of_device_id rwdt_ids[] = {
> { .compatible = "renesas,rcar-gen2-wdt", },
> @@ -334,7 +334,7 @@ static struct platform_driver rwdt_driver = {
> .driver = {
> .name = "renesas_wdt",
> .of_match_table = rwdt_ids,
> - .pm = &rwdt_pm_ops,
> + .pm = pm_sleep_ptr(&rwdt_pm_ops),
> },
> .probe = rwdt_probe,
> .remove = rwdt_remove,
> --
> 2.43.0
>
