[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 1804926eec28ef558225577d086fad7a91cbc38a
Author: Werner Almesberger <werner at openmoko.org>
Date:   Tue Mar 31 04:02:04 2009 -0300

    AR6000: revert MMC busy status check
    
    e2c0650efa751a6a2220618695fa41a2a5e7d23c introduced a platform-specific
    hack to check if the MMC driver and hardware handle busy signaling from
    the device properly.
    
    Since this seems to be the case, we can revert this hack now.
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index 8d0755f..fddd2af 100644
--- a/drivers/ar6000/hif/hif2.c
+++ b/drivers/ar6000/hif/hif2.c
@@ -26,7 +26,6 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_ids.h>
-#include <asm/gpio.h>
 #include <mach/gta02-pm-wlan.h>
 
 #include "athdefs.h"
@@ -132,9 +131,6 @@ static DEFINE_MUTEX(shutdown_lock);
 /* ----- Request processing ------------------------------------------------ */
 
 
-#include <mach/regs-gpio.h>
-
-
 static A_STATUS process_request(struct hif_request *req)
 {
 	int ret;
@@ -143,16 +139,8 @@ static A_STATUS process_request(struct hif_request *req)
 	dev_dbg(&req->func->dev, "process_request(req %p)\n", req);
 	sdio_claim_host(req->func);
 	if (req->read) {
-		while (!s3c2410_gpio_getpin(S3C2410_GPE7)) {
-			printk(KERN_INFO "READ WHILE BUSY !\n");
-			yield();
-		}
 		ret = req->read(req->func, req->buf, req->addr, req->len);
 	} else {
-		while (!s3c2410_gpio_getpin(S3C2410_GPE7)) {
-			printk(KERN_INFO "WRITE WHILE BUSY !\n");
-			yield();
-		}
 		ret = req->write(req->func, req->addr, req->buf, req->len);
 	}
 	sdio_release_host(req->func);

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko