Merge tag 'mmc-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[linux-2.6-microblaze.git] / drivers / mmc / host / jz4740_mmc.c

diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index a0b94f6..7693236 100644 (file)
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -1118,17 +1118,17 @@ static int jz4740_mmc_remove(struct platform_device *pdev)
        return 0;
 }
 
-static int __maybe_unused jz4740_mmc_suspend(struct device *dev)
+static int jz4740_mmc_suspend(struct device *dev)
 {
        return pinctrl_pm_select_sleep_state(dev);
 }
 
-static int __maybe_unused jz4740_mmc_resume(struct device *dev)
+static int jz4740_mmc_resume(struct device *dev)
 {
        return pinctrl_select_default_state(dev);
 }
 
-static SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
+DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
        jz4740_mmc_resume);
 
 static struct platform_driver jz4740_mmc_driver = {
@@ -1138,7 +1138,7 @@ static struct platform_driver jz4740_mmc_driver = {
                .name = "jz4740-mmc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(jz4740_mmc_of_match),
-               .pm = pm_ptr(&jz4740_mmc_pm_ops),
+               .pm = pm_sleep_ptr(&jz4740_mmc_pm_ops),
        },
 };