drivers/mmc/host/msm-sdcc: remove dead config options
authorChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Wed, 11 Aug 2010 01:01:53 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 15:59:04 +0000 (08:59 -0700)
CONFIG_MMC_MSM7X00A_RESUME_IN_WQ and CONFIG_MMC_EMBEDDED_SDIO don't exist
in Kconfig and is never defined anywhere else, therefore removing all
references for it from the source code.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@codeaurora.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/mmc/host/msm_sdcc.c
drivers/mmc/host/msm_sdcc.h

index 24e09454e52238c87c6b00dfdaee00196f4ac6eb..3bd8ff71ec22d5f0f250799665f485825a67e096 100644 (file)
@@ -1057,22 +1057,6 @@ msmsdcc_init_dma(struct msmsdcc_host *host)
        return 0;
 }
 
-#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
-static void
-do_resume_work(struct work_struct *work)
-{
-       struct msmsdcc_host *host =
-               container_of(work, struct msmsdcc_host, resume_task);
-       struct mmc_host *mmc = host->mmc;
-
-       if (mmc) {
-               mmc_resume_host(mmc);
-               if (host->stat_irq)
-                       enable_irq(host->stat_irq);
-       }
-}
-#endif
-
 static int
 msmsdcc_probe(struct platform_device *pdev)
 {
@@ -1145,15 +1129,6 @@ msmsdcc_probe(struct platform_device *pdev)
        host->dmares = dmares;
        spin_lock_init(&host->lock);
 
-#ifdef CONFIG_MMC_EMBEDDED_SDIO
-       if (plat->embedded_sdio)
-               mmc_set_embedded_sdio_data(mmc,
-                                          &plat->embedded_sdio->cis,
-                                          &plat->embedded_sdio->cccr,
-                                          plat->embedded_sdio->funcs,
-                                          plat->embedded_sdio->num_funcs);
-#endif
-
        /*
         * Setup DMA
         */
index da0039c9285e846164378bb817ff77e68a99847a..d7dedcf33b5b31e3df7ed381c002d7624e2a06b8 100644 (file)
@@ -235,10 +235,6 @@ struct msmsdcc_host {
        int                     cmdpoll;
        struct msmsdcc_stats    stats;
 
-#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
-       struct work_struct      resume_task;
-#endif
-
        /* Command parameters */
        unsigned int            cmd_timeout;
        unsigned int            cmd_pio_irqmask;