]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: sh-msiof: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 9 Jul 2025 19:02:33 +0000 (21:02 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 10 Jul 2025 08:16:14 +0000 (09:16 +0100)
Convert the Renesas SuperH MSIOF driver from SIMPLE_DEV_PM_OPS() to
DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr().  This lets us drop the
check for CONFIG_PM_SLEEP without impacting code size, while increasing
build coverage.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/108c136f2cab9aa8bc8ac90d14a05e66fb87deb0.1752087740.git.geert+renesas@glider.be
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sh-msiof.c

index 94a867967e024446fa808a0573826702bc3c702c..b695870fae8c4bd6799d5dbf9c258539b9a1b884 100644 (file)
@@ -1320,7 +1320,6 @@ static const struct platform_device_id spi_driver_ids[] = {
 };
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);
 
-#ifdef CONFIG_PM_SLEEP
 static int sh_msiof_spi_suspend(struct device *dev)
 {
        struct sh_msiof_spi_priv *p = dev_get_drvdata(dev);
@@ -1335,12 +1334,8 @@ static int sh_msiof_spi_resume(struct device *dev)
        return spi_controller_resume(p->ctlr);
 }
 
-static SIMPLE_DEV_PM_OPS(sh_msiof_spi_pm_ops, sh_msiof_spi_suspend,
-                        sh_msiof_spi_resume);
-#define DEV_PM_OPS     (&sh_msiof_spi_pm_ops)
-#else
-#define DEV_PM_OPS     NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(sh_msiof_spi_pm_ops, sh_msiof_spi_suspend,
+                               sh_msiof_spi_resume);
 
 static struct platform_driver sh_msiof_spi_drv = {
        .probe          = sh_msiof_spi_probe,
@@ -1348,7 +1343,7 @@ static struct platform_driver sh_msiof_spi_drv = {
        .id_table       = spi_driver_ids,
        .driver         = {
                .name           = "spi_sh_msiof",
-               .pm             = DEV_PM_OPS,
+               .pm             = pm_sleep_ptr(&sh_msiof_spi_pm_ops),
                .of_match_table = of_match_ptr(sh_msiof_match),
        },
 };