diff mbox

mmc: dw_mmc: Handle DW_MCI_QUIRK_IDMAC_DTO properly

Message ID 1373400280-7408-1-git-send-email-dianders@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Doug Anderson July 9, 2013, 8:04 p.m. UTC
In (1fb5f68 mmc: dw_mmc: Don't loop when handling an interrupt), the
code for handling DW_MCI_QUIRK_IDMAC_DTO became dead code.  Move it to
where it ought to live.

Found by code inspection and compile-tested only--I don't know of any
boards that need DW_MCI_QUIRK_IDMAC_DTO.

Signed-off-by: Doug Anderson <dianders@chromium.org>
---
 drivers/mmc/host/dw_mmc.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Comments

Seungwon Jeon July 10, 2013, 2:54 p.m. UTC | #1
On Wed, July 10, 2013, Doug Anderson wrote:
> In (1fb5f68 mmc: dw_mmc: Don't loop when handling an interrupt), the
> code for handling DW_MCI_QUIRK_IDMAC_DTO became dead code.  Move it to
> where it ought to live.
> 
> Found by code inspection and compile-tested only--I don't know of any
> boards that need DW_MCI_QUIRK_IDMAC_DTO.
> 
> Signed-off-by: Doug Anderson <dianders@chromium.org>

Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chris Ball Aug. 25, 2013, 2:22 a.m. UTC | #2
Hi,

On Wed, Jul 10 2013, Seungwon Jeon wrote:
> On Wed, July 10, 2013, Doug Anderson wrote:
>> In (1fb5f68 mmc: dw_mmc: Don't loop when handling an interrupt), the
>> code for handling DW_MCI_QUIRK_IDMAC_DTO became dead code.  Move it to
>> where it ought to live.
>> 
>> Found by code inspection and compile-tested only--I don't know of any
>> boards that need DW_MCI_QUIRK_IDMAC_DTO.
>> 
>> Signed-off-by: Doug Anderson <dianders@chromium.org>
>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

Thanks, pushed to mmc-next for 3.12.

- Chris.
diff mbox

Patch

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index bc3a1bc..cdc0940 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1595,18 +1595,17 @@  static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 
 	pending = mci_readl(host, MINTSTS); /* read-only mask reg */
 
-	if (pending) {
-
-		/*
-		 * DTO fix - version 2.10a and below, and only if internal DMA
-		 * is configured.
-		 */
-		if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) {
-			if (!pending &&
-			    ((mci_readl(host, STATUS) >> 17) & 0x1fff))
-				pending |= SDMMC_INT_DATA_OVER;
-		}
+	/*
+	 * DTO fix - version 2.10a and below, and only if internal DMA
+	 * is configured.
+	 */
+	if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) {
+		if (!pending &&
+		    ((mci_readl(host, STATUS) >> 17) & 0x1fff))
+			pending |= SDMMC_INT_DATA_OVER;
+	}
 
+	if (pending) {
 		if (pending & DW_MCI_CMD_ERROR_FLAGS) {
 			mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS);
 			host->cmd_status = pending;