2013-07-09 20:13:12

by Doug Anderson

Subject: [PATCH] mmc: dw_mmc: Handle DW_MCI_QUIRK_IDMAC_DTO properly

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 <[email protected]>
---
drivers/mmc/host/dw_mmc.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)

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;
--
1.8.3

2013-07-10 14:54:40

by Seungwon Jeon

Subject: RE: [PATCH] mmc: dw_mmc: Handle DW_MCI_QUIRK_IDMAC_DTO properly

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 <[email protected]>

Acked-by: Seungwon Jeon <[email protected]>

2013-08-25 02:22:18

by Chris Ball

Subject: Re: [PATCH] mmc: dw_mmc: Handle DW_MCI_QUIRK_IDMAC_DTO properly

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 <[email protected]>
>
> Acked-by: Seungwon Jeon <[email protected]>

Thanks, pushed to mmc-next for 3.12.

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>