fix recent MMC driver compile breakage

The OMAP MMC driver previously supported multiple cards per MMC host,
but upper-layer support for this was recently removed (commit
b855885e3b60cf6f9452848712a62517b94583eb).  So, remove this support from
this driver, and add a missing include.

Compile-tested only.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 54a821ee5510dc54a774bd968fa0d0500135b1d5..383bd54b34b524a77c8c9355affae3f5faa72c9d 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
+#include <linux/mmc/mmc.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/clk.h>
@@ -587,9 +588,8 @@ static void mmc_omap_switch_timer(unsigned long arg)
 static void mmc_omap_switch_handler(struct work_struct *work)
 {
        struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, switch_work);
-       struct mmc_card *card;
        static int complained = 0;
-       int cards = 0, cover_open;
+       int cover_open;
 
        if (host->switch_pin == -1)
                return;
@@ -599,10 +599,6 @@ static void mmc_omap_switch_handler(struct work_struct *work)
                host->switch_last_state = cover_open;
        }
        mmc_detect_change(host->mmc, 0);
-       list_for_each_entry(card, &host->mmc->cards, node) {
-               if (mmc_card_present(card))
-                       cards++;
-       }
        if (mmc_omap_cover_is_open(host)) {
                if (!complained) {
                        dev_info(mmc_dev(host->mmc), "cover is open\n");