Revert "mmc: core: Convert mmc_driver to device_driver"
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 14 Apr 2015 11:06:12 +0000 (13:06 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 17 Apr 2015 09:48:01 +0000 (11:48 +0200)
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>
drivers/mmc/card/block.c
drivers/mmc/card/mmc_test.c
drivers/mmc/core/bus.c
include/linux/mmc/card.h

Simple merge
Simple merge
Simple merge
Simple merge