ENGR00174038 [mx6 mmc]fix build err

fix build error:
incompatible pointer type

Signed-off-by: Tony Lin <tony.lin@freescale.com>

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index c0839d48f6c33588c9a53838c601052878c092fe..a87db1fda56f84689e9ebb3759d8ff2a13588cbb 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1313,7 +1313,7 @@ static void mmc_blk_remove(struct mmc_card *card)
 }
 
 #ifdef CONFIG_PM
-static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state)
+static int mmc_blk_suspend(struct mmc_card *card)
 {
        struct mmc_blk_data *part_md;
        struct mmc_blk_data *md = mmc_get_drvdata(card);

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 56eb05649bffd58d582eee5f5752575a78017a2d..838286afe605f7e42248a8016f73a3cf84bf8826 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -120,14 +120,14 @@ static int mmc_bus_remove(struct device *dev)
        return 0;
 }
 
-static int mmc_bus_suspend(struct device *dev, pm_message_t state)
+static int mmc_bus_suspend(struct device *dev)
 {
        struct mmc_driver *drv = to_mmc_driver(dev->driver);
        struct mmc_card *card = mmc_dev_to_card(dev);
        int ret = 0;
 
        if (dev->driver && drv->suspend)
-               ret = drv->suspend(card, state);
+               ret = drv->suspend(card);
        return ret;
 }
 

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 68643440465192838178c637bd0bc9e1807f7f0e..b8ed8398240b747a57b76ebb46c342b5b2c864d8 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -401,7 +401,7 @@ struct mmc_driver {
        struct device_driver drv;
        int (*probe)(struct mmc_card *);
        void (*remove)(struct mmc_card *);
-       int (*suspend)(struct mmc_card *, pm_message_t);
+       int (*suspend)(struct mmc_card *);
        int (*resume)(struct mmc_card *);
 };