[PATCH 2/3] ar6k: Remove SDIO controller pending irqs check

Samuel Ortiz sameo at openedhand.com
Thu Jan 31 21:42:37 CET 2008


Hi Werner,

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>
---
 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |    8 --------
 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |    1 -
 2 files changed, 9 deletions(-)

Index: linux-2.6.24-rc8-omoko-svn/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- linux-2.6.24-rc8-omoko-svn.orig/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c	2008-01-31 20:56:18.000000000 +0100
+++ linux-2.6.24-rc8-omoko-svn/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c	2008-01-31 21:10:21.000000000 +0100
@@ -763,8 +763,6 @@
 			imask &= ~S3C2410_SDIIMSK_SDIOIRQ;
 			writel(imask, context->base + S3C2440_SDIIMSK);
 			schedule_work(&context->irq_work);
-		} else {
-			context->int_pending = 1;
 		}
 	}
 
@@ -918,11 +916,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;
@@ -1341,7 +1334,6 @@
 	hcd_context.dma_en = 0;
 
 	hcd_context.int_sdio = 0;
-	hcd_context.int_pending = 0;
 
 	spin_lock_init(&hcd_context.lock);
 
Index: linux-2.6.24-rc8-omoko-svn/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
===================================================================
--- linux-2.6.24-rc8-omoko-svn.orig/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h	2008-01-31 20:56:18.000000000 +0100
+++ linux-2.6.24-rc8-omoko-svn/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h	2008-01-31 21:10:21.000000000 +0100
@@ -46,7 +46,6 @@
 
 	UINT32		  	  int_mask;
 	UINT32		  	  int_sdio;            /* Do we have SDIO interrupt on ? */
-	UINT32		  	  int_pending;
 
 	UINT32		  	  complete;
 





More information about the openmoko-kernel mailing list