public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Walmsley <paul@pwsan.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH] fix recent MMC driver compile breakage
Date: Tue, 08 May 2007 17:20:29 -0600	[thread overview]
Message-ID: <20070508232045.583862612@pwsan.com> (raw)
In-Reply-To: 20070508232028.416620727@pwsan.com

[-- Attachment #1: fix-mmc-driver.patch --]
[-- Type: text/plain, Size: 1546 bytes --]

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>

---
 drivers/mmc/host/omap.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Index: linux-omap-2.6/drivers/mmc/host/omap.c
===================================================================
--- linux-omap-2.6.orig/drivers/mmc/host/omap.c
+++ linux-omap-2.6/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(unsign
 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(stru
 		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");

-- 

       reply	other threads:[~2007-05-08 23:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20070508232028.416620727@pwsan.com>
2007-05-08 23:20 ` Paul Walmsley [this message]
2007-05-08 23:36   ` [PATCH] fix recent MMC driver compile breakage Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070508232045.583862612@pwsan.com \
    --to=paul@pwsan.com \
    --cc=linux-omap-open-source@linux.omap.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox