]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mmc: jz4740: Use pm_ptr() macro
authorPaul Cercueil <paul@crapouillou.net>
Thu, 16 Jul 2020 12:42:50 +0000 (14:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 27 Jul 2020 11:52:36 +0000 (13:52 +0200)
Use the newly introduced pm_ptr() macro to simplify the code.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/mmc/host/jz4740_mmc.c

index cba7a6fcd178cc4591d2a5715aa715b2b98ddf60..447552ac25c4a34386e815390d7fac66b418d99a 100644 (file)
@@ -1108,24 +1108,18 @@ static int jz4740_mmc_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-
-static int jz4740_mmc_suspend(struct device *dev)
+static int __maybe_unused jz4740_mmc_suspend(struct device *dev)
 {
        return pinctrl_pm_select_sleep_state(dev);
 }
 
-static int jz4740_mmc_resume(struct device *dev)
+static int __maybe_unused jz4740_mmc_resume(struct device *dev)
 {
        return pinctrl_select_default_state(dev);
 }
 
 static SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
        jz4740_mmc_resume);
-#define JZ4740_MMC_PM_OPS (&jz4740_mmc_pm_ops)
-#else
-#define JZ4740_MMC_PM_OPS NULL
-#endif
 
 static struct platform_driver jz4740_mmc_driver = {
        .probe = jz4740_mmc_probe,
@@ -1133,7 +1127,7 @@ static struct platform_driver jz4740_mmc_driver = {
        .driver = {
                .name = "jz4740-mmc",
                .of_match_table = of_match_ptr(jz4740_mmc_of_match),
-               .pm = JZ4740_MMC_PM_OPS,
+               .pm = pm_ptr(&jz4740_mmc_pm_ops),
        },
 };