mmc: dw_mmc: change the macro name from DTO to DRTO

PATCH In review Jaehoon Chung 4 participants 4 messages May 27, 2013 – Jun 27, 2013

Subsystems (2)

MMC, SD and SDIO Synopsys DesignWare MMC/SD/SDIO driver

lore

Share & tools

lore

Jaehoon Chung

author maintainer

2013-05-27 04:47 UTC #0 lore raw

PATCH 1/1 mmc: dw_mmc: change the macro name from DTO to DRTO

At Interrupt status register, Bit9 is Data Read Timeout. But we used macro name as the DTO. It could be confused with the Data Transfer Over(DTO)-Bit[3].
it's clearly that is changed the DRTO instead of DTO.

Signed-off-by Jaehoon Chung <[email protected]>

---
 drivers/mmc/host/dw_mmc.c |    4 ++--
 drivers/mmc/host/dw_mmc.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/mmc/host/dw_mmc.c +2 -2

index b10e5e1..7dca5e9 100644
@@ -39,7 +39,7 @@
 #include "dw_mmc.h"
 
 /* Common flag combinations */
-#define DW_MCI_DATA_ERROR_FLAGS	(SDMMC_INT_DTO | SDMMC_INT_DCRC | \
+#define DW_MCI_DATA_ERROR_FLAGS	(SDMMC_INT_DRTO | SDMMC_INT_DCRC | \
 				 SDMMC_INT_HTO | SDMMC_INT_SBE  | \
 				 SDMMC_INT_EBE)
 #define DW_MCI_CMD_ERROR_FLAGS	(SDMMC_INT_RTO | SDMMC_INT_RCRC | \

@@ -1093,7 +1093,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
 			status = host->data_status;
 
 			if (status & DW_MCI_DATA_ERROR_FLAGS) {
-				if (status & SDMMC_INT_DTO) {
+				if (status & SDMMC_INT_DRTO) {
 					data->error = -ETIMEDOUT;
 				} else if (status & SDMMC_INT_DCRC) {
 					data->error = -EILSEQ;

drivers/mmc/host/dw_mmc.h +1 -1

index 0b74189..2f52c87 100644
@@ -98,7 +98,7 @@
 #define SDMMC_INT_HLE			BIT(12)
 #define SDMMC_INT_FRUN			BIT(11)
 #define SDMMC_INT_HTO			BIT(10)
-#define SDMMC_INT_DTO			BIT(9)
+#define SDMMC_INT_DRTO			BIT(9)
 #define SDMMC_INT_RTO			BIT(8)
 #define SDMMC_INT_DCRC			BIT(7)
 #define SDMMC_INT_RCRC			BIT(6)

Signature · 1 line

1.7.9.5

James Hogan

Reviewed-by on v1 1/1

2013-05-28 09:15 UTC #1 lore raw

Quoted 6 lines · Jaehoon Chung

At Interrupt status register, Bit9 is Data Read Timeout. But we used macro name as the DTO. It could be confused with the Data Transfer Over(DTO)-Bit[3].
it's clearly that is changed the DRTO instead of DTO.
Signed-off-by Jaehoon Chung <[email protected]>

Reviewed-by James Hogan <[email protected]>

Seungwon Jeon

Acked-by

2013-05-28 12:04 UTC #2 lore raw

Quoted 9 lines · James Hogan

Quoted 6 lines · Jaehoon Chung
At Interrupt status register, Bit9 is Data Read Timeout. But we used macro name as the DTO. It could be confused with the Data Transfer Over(DTO)-Bit[3].
it's clearly that is changed the DRTO instead of DTO.
Signed-off-by Jaehoon Chung <[email protected]>
Reviewed-by James Hogan <[email protected]>

Acked-by Seungwon Jeon <[email protected]>

Chris Ball

2013-06-27 14:54 UTC #3 lore raw

Hi,

Quoted 7 lines · Seungwon Jeon

Quoted 6 lines · James Hogan
Quoted 5 lines · Jaehoon Chung
At Interrupt status register, Bit9 is Data Read Timeout. But we used macro name as the DTO. It could be confused with the Data Transfer Over(DTO)-Bit[3].
it's clearly that is changed the DRTO instead of DTO.

Quoted 5 lines

Quoted 3 lines
Quoted 1 line
Signed-off-by Jaehoon Chung <[email protected]>
Reviewed-by James Hogan <[email protected]>
Acked-by Seungwon Jeon <[email protected]>

Thanks, pushed to mmc-next for 3.11.

- Chris.

Signature · 2 lines

Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child