r4006 - branches/src/target/kernel/2.6.24.x/patches

werner at sita.openmoko.org werner at sita.openmoko.org
Fri Feb 1 02:11:01 CET 2008


Author: werner
Date: 2008-02-01 02:10:57 +0100 (Fri, 01 Feb 2008)
New Revision: 4006

Modified:
   branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch
Log:
[PATCH 2/3] ar6k: Remove SDIO controller pending irqs check

With the recently added asynchronous SDIO interrupt bottom half code,
we don't need to double check for pending IRQs.

Signed-off-by: Samuel Ortiz <sameo at openedhand.com>



Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch	2008-02-01 01:07:28 UTC (rev 4005)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch	2008-02-01 01:10:57 UTC (rev 4006)
@@ -34,7 +34,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -0,0 +1,1510 @@
+@@ -0,0 +1,1502 @@
 +/*
 + * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
 + *
@@ -800,8 +800,6 @@
 +			imask &= ~S3C2410_SDIIMSK_SDIOIRQ;
 +			writel(imask, context->base + S3C2440_SDIIMSK);
 +			schedule_work(&context->irq_work);
-+		} else {
-+			context->int_pending = 1;
 +		}
 +	}
 +
@@ -955,11 +953,6 @@
 +        case SDCONFIG_SDIO_REARM_INT:
 +		DBG_PRINT(SDDBG_TRACE, ("config SDIO_REARM_INT\n"));
 +
-+		if (context->int_pending) {
-+			context->int_pending = 0;
-+			schedule_work(&context->irq_work);
-+		}
-+
 +		context->int_sdio = 1;
 +		imsk = readl(context->base + S3C2440_SDIIMSK);
 +		imsk |= S3C2410_SDIIMSK_SDIOIRQ;
@@ -1378,7 +1371,6 @@
 +	hcd_context.dma_en = 0;
 +
 +	hcd_context.int_sdio = 0;
-+	hcd_context.int_pending = 0;
 +
 +	spin_lock_init(&hcd_context.lock);
 +
@@ -1549,7 +1541,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,67 @@
 +#ifndef __SDIO_S3C24XX_HCD_H___
 +#define __SDIO_S3C24XX_HCD_H___
 +
@@ -1598,7 +1590,6 @@
 +
 +	UINT32		  	  int_mask;
 +	UINT32		  	  int_sdio;            /* Do we have SDIO interrupt on ? */
-+	UINT32		  	  int_pending;
 +
 +	UINT32		  	  complete;
 +





More information about the commitlog mailing list