Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[linux-drm-fsl-dcu.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index b94f38ec2a838acff3f67861a8059eb22d41c2ff..0b10a9030f4e2a85029ea4bab3afcdb8102899be 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -128,7 +128,6 @@ struct mmc_omap_slot {
 
 struct mmc_omap_host {
        int                     initialized;
-       int                     suspended;
        struct mmc_request *    mrq;
        struct mmc_command *    cmd;
        struct mmc_data *       data;
@@ -1513,61 +1512,9 @@ static int mmc_omap_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int mmc_omap_suspend(struct platform_device *pdev, pm_message_t mesg)
-{
-       int i, ret = 0;
-       struct mmc_omap_host *host = platform_get_drvdata(pdev);
-
-       if (host == NULL || host->suspended)
-               return 0;
-
-       for (i = 0; i < host->nr_slots; i++) {
-               struct mmc_omap_slot *slot;
-
-               slot = host->slots[i];
-               ret = mmc_suspend_host(slot->mmc);
-               if (ret < 0) {
-                       while (--i >= 0) {
-                               slot = host->slots[i];
-                               mmc_resume_host(slot->mmc);
-                       }
-                       return ret;
-               }
-       }
-       host->suspended = 1;
-       return 0;
-}
-
-static int mmc_omap_resume(struct platform_device *pdev)
-{
-       int i, ret = 0;
-       struct mmc_omap_host *host = platform_get_drvdata(pdev);
-
-       if (host == NULL || !host->suspended)
-               return 0;
-
-       for (i = 0; i < host->nr_slots; i++) {
-               struct mmc_omap_slot *slot;
-               slot = host->slots[i];
-               ret = mmc_resume_host(slot->mmc);
-               if (ret < 0)
-                       return ret;
-
-               host->suspended = 0;
-       }
-       return 0;
-}
-#else
-#define mmc_omap_suspend       NULL
-#define mmc_omap_resume                NULL
-#endif
-
 static struct platform_driver mmc_omap_driver = {
        .probe          = mmc_omap_probe,
        .remove         = mmc_omap_remove,
-       .suspend        = mmc_omap_suspend,
-       .resume         = mmc_omap_resume,
        .driver         = {
                .name   = DRIVER_NAME,
                .owner  = THIS_MODULE,