Revert "mmc: core: Convert mmc_driver to device_driver"

This reverts commit 6685ac62b2f0 ("mmc: core: Convert mmc_driver to
device_driver")

The reverted commit went too far in simplifing the device driver parts
for mmc.

Let's restore the old mmc_driver to enable driver core to sooner
or later to remove the ->probe(), ->remove() and ->shutdown() callbacks
from the struct device_driver.

Note that, the old ->suspend|resume() callbacks in the struct
mmc_driver don't need to be restored, since the mmc block layer has
converted to the modern system PM ops.

Fixes: 6685ac62b2f0 ("mmc: core: Convert mmc_driver to device_driver")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

2 files changed, 24 insertions, 28 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 2fc426926574..2c25271f8c41 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2418,9 +2418,8 @@ static const struct mmc_fixup blk_fixups[] =
         END_FIXUP
 };
 
-static int mmc_blk_probe(struct device *dev)
+static int mmc_blk_probe(struct mmc_card *card)
 {
-        struct mmc_card *card = mmc_dev_to_card(dev);
         struct mmc_blk_data *md, *part_md;
         char cap_str[10];
 
@@ -2445,7 +2444,7 @@ static int mmc_blk_probe(struct device *dev)
         if (mmc_blk_alloc_parts(card, md))
                 goto out;
 
-        dev_set_drvdata(dev, md);
+        dev_set_drvdata(&card->dev, md);
 
         if (mmc_add_disk(md))
                 goto out;
@@ -2475,10 +2474,9 @@ static int mmc_blk_probe(struct device *dev)
         return 0;
 }
 
-static int mmc_blk_remove(struct device *dev)
+static void mmc_blk_remove(struct mmc_card *card)
 {
-        struct mmc_card *card = mmc_dev_to_card(dev);
-        struct mmc_blk_data *md = dev_get_drvdata(dev);
+        struct mmc_blk_data *md = dev_get_drvdata(&card->dev);
 
         mmc_blk_remove_parts(card, md);
         pm_runtime_get_sync(&card->dev);
@@ -2489,15 +2487,13 @@ static int mmc_blk_remove(struct device *dev)
                 pm_runtime_disable(&card->dev);
         pm_runtime_put_noidle(&card->dev);
         mmc_blk_remove_req(md);
-        dev_set_drvdata(dev, NULL);
-
-        return 0;
+        dev_set_drvdata(&card->dev, NULL);
 }
 
-static int _mmc_blk_suspend(struct device *dev)
+static int _mmc_blk_suspend(struct mmc_card *card)
 {
         struct mmc_blk_data *part_md;
-        struct mmc_blk_data *md = dev_get_drvdata(dev);
+        struct mmc_blk_data *md = dev_get_drvdata(&card->dev);
 
         if (md) {
                 mmc_queue_suspend(&md->queue);
@@ -2508,15 +2504,17 @@ static int _mmc_blk_suspend(struct device *dev)
         return 0;
 }
 
-static void mmc_blk_shutdown(struct device *dev)
+static void mmc_blk_shutdown(struct mmc_card *card)
 {
-        _mmc_blk_suspend(dev);
+        _mmc_blk_suspend(card);
 }
 
 #ifdef CONFIG_PM_SLEEP
 static int mmc_blk_suspend(struct device *dev)
 {
-        return _mmc_blk_suspend(dev);
+        struct mmc_card *card = mmc_dev_to_card(dev);
+
+        return _mmc_blk_suspend(card);
 }
 
 static int mmc_blk_resume(struct device *dev)
@@ -2541,9 +2539,11 @@ static int mmc_blk_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(mmc_blk_pm_ops, mmc_blk_suspend, mmc_blk_resume);
 
-static struct device_driver mmc_driver = {
-        .name           = "mmcblk",
-        .pm             = &mmc_blk_pm_ops,
+static struct mmc_driver mmc_driver = {
+        .drv            = {
+                .name   = "mmcblk",
+                .pm     = &mmc_blk_pm_ops,
+        },
         .probe          = mmc_blk_probe,
         .remove         = mmc_blk_remove,
         .shutdown       = mmc_blk_shutdown,
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 7dac4695163b..53b741398b93 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -14,7 +14,6 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
 #include <linux/slab.h>
-#include <linux/device.h>
 
 #include <linux/scatterlist.h>
 #include <linux/swap.h>         /* For nr_free_buffer_pages() */
@@ -2996,9 +2995,8 @@ err:
         return ret;
 }
 
-static int mmc_test_probe(struct device *dev)
+static int mmc_test_probe(struct mmc_card *card)
 {
-        struct mmc_card *card = mmc_dev_to_card(dev);
         int ret;
 
         if (!mmc_card_mmc(card) && !mmc_card_sd(card))
@@ -3013,22 +3011,20 @@ static int mmc_test_probe(struct device *dev)
         return 0;
 }
 
-static int mmc_test_remove(struct device *dev)
+static void mmc_test_remove(struct mmc_card *card)
 {
-        struct mmc_card *card = mmc_dev_to_card(dev);
-
         mmc_test_free_result(card);
         mmc_test_free_dbgfs_file(card);
-
-        return 0;
 }
 
-static void mmc_test_shutdown(struct device *dev)
+static void mmc_test_shutdown(struct mmc_card *card)
 {
 }
 
-static struct device_driver mmc_driver = {
-        .name   = "mmc_test",
+static struct mmc_driver mmc_driver = {
+        .drv            = {
+                .name   = "mmc_test",
+        },
         .probe          = mmc_test_probe,
         .remove         = mmc_test_remove,
         .shutdown       = mmc_test_shutdown,