mmc: core: Convert the mmc_driver to use the modern PM ops

[karo-tx-linux.git] / drivers / mmc / card / block.c

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index a11451f4f408da8a226494e97adf2439a0986b2c..dfbdfb995dd32d3885d0af2814061a237db3a313 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2516,15 +2516,17 @@ static void mmc_blk_shutdown(struct mmc_card *card)
        _mmc_blk_suspend(card);
 }
 
-#ifdef CONFIG_PM
-static int mmc_blk_suspend(struct mmc_card *card)
+#ifdef CONFIG_PM_SLEEP
+static int mmc_blk_suspend(struct device *dev)
 {
+       struct mmc_card *card = mmc_dev_to_card(dev);
        return _mmc_blk_suspend(card);
 }
 
-static int mmc_blk_resume(struct mmc_card *card)
+static int mmc_blk_resume(struct device *dev)
 {
        struct mmc_blk_data *part_md;
+       struct mmc_card *card = mmc_dev_to_card(dev);
        struct mmc_blk_data *md = mmc_get_drvdata(card);
 
        if (md) {
@@ -2540,19 +2542,17 @@ static int mmc_blk_resume(struct mmc_card *card)
        }
        return 0;
 }
-#else
-#define        mmc_blk_suspend NULL
-#define mmc_blk_resume NULL
 #endif
 
+static 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,
        },
        .probe          = mmc_blk_probe,
        .remove         = mmc_blk_remove,
-       .suspend        = mmc_blk_suspend,
-       .resume         = mmc_blk_resume,
        .shutdown       = mmc_blk_shutdown,
 };