pinctrl: renesas: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 17 Jul 2023 17:28:20 +0000 (20:28 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 21 Aug 2023 16:00:18 +0000 (19:00 +0300)
Since pm.h provides a helper for system no-IRQ PM callbacks,
switch the driver to use it instead of open coded variant.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230717172821.62827-10-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/pinctrl/renesas/core.c

index 0c8d081..34232b0 100644 (file)
@@ -649,7 +649,7 @@ static const struct of_device_id sh_pfc_of_table[] = {
 };
 #endif
 
-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_ARM_PSCI_FW)
+#if defined(CONFIG_ARM_PSCI_FW)
 static void sh_pfc_nop_reg(struct sh_pfc *pfc, u32 reg, unsigned int idx)
 {
 }
@@ -732,15 +732,13 @@ static int sh_pfc_resume_noirq(struct device *dev)
                sh_pfc_walk_regs(pfc, sh_pfc_restore_reg);
        return 0;
 }
-
-static const struct dev_pm_ops sh_pfc_pm  = {
-       SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(sh_pfc_suspend_noirq, sh_pfc_resume_noirq)
-};
-#define DEV_PM_OPS     &sh_pfc_pm
 #else
 static int sh_pfc_suspend_init(struct sh_pfc *pfc) { return 0; }
-#define DEV_PM_OPS     NULL
-#endif /* CONFIG_PM_SLEEP && CONFIG_ARM_PSCI_FW */
+static int sh_pfc_suspend_noirq(struct device *dev) { return 0; }
+static int sh_pfc_resume_noirq(struct device *dev) { return 0; }
+#endif /* CONFIG_ARM_PSCI_FW */
+
+static DEFINE_NOIRQ_DEV_PM_OPS(sh_pfc_pm, sh_pfc_suspend_noirq, sh_pfc_resume_noirq);
 
 #ifdef DEBUG
 #define SH_PFC_MAX_REGS                300
@@ -1418,7 +1416,7 @@ static struct platform_driver sh_pfc_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .of_match_table = of_match_ptr(sh_pfc_of_table),
-               .pm     = DEV_PM_OPS,
+               .pm     = pm_sleep_ptr(&sh_pfc_pm),
        },
 };