mmc: block: Convert to use DEFINE_SIMPLE_DEV_PM_OPS()

Convert to use DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() to drop the
CONFIG_PM_SLEEP to handle the conditional compilation when PM support is
disabled. This allows the compiler to automatically optimize away the
unused code paths when CONFIG_PM_SLEEP is not selected.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 5032f7a8ead0663a62f95942817381410d4d12a7..53c1b04f19163a30f7aef430a9e4f98a2b26e0cb 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -3362,7 +3362,6 @@ static void mmc_blk_shutdown(struct mmc_card *card)
        _mmc_blk_suspend(card);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int mmc_blk_suspend(struct device *dev)
 {
        struct mmc_card *card = mmc_dev_to_card(dev);
@@ -3388,14 +3387,13 @@ static int mmc_blk_resume(struct device *dev)
        }
        return 0;
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(mmc_blk_pm_ops, mmc_blk_suspend, mmc_blk_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(mmc_blk_pm_ops, mmc_blk_suspend, mmc_blk_resume);
 
 static struct mmc_driver mmc_driver = {
        .drv            = {
                .name   = "mmcblk",
-               .pm     = &mmc_blk_pm_ops,
+               .pm     = pm_sleep_ptr(&mmc_blk_pm_ops),
        },
        .probe          = mmc_blk_probe,
        .remove         = mmc_blk_remove,