mmc: dw-mmc: remove the duplicated code

PATCH In review Jaehoon Chung 5 participants 5 messages Nov 8, 2012 – Dec 3, 2012

Subsystems (2)

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

lore

Share & tools

lore

Jaehoon Chung

author maintainer

2012-11-08 08:35 UTC #0 lore raw

PATCH v3 2/4 mmc: dw-mmc: remove the duplicated code

ctype is used 1-bit buswidth mode by default.

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

Signed-off-by Kyungmin Park <[email protected]>

---
 drivers/mmc/host/dw_mmc.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

drivers/mmc/host/dw_mmc.c +3 -6

index a1369aa..0a80b5c 100644
@@ -773,19 +773,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	struct dw_mci_drv_data *drv_data = slot->host->drv_data;
 	u32 regs;
 
-	/* set default 1 bit mode */
-	slot->ctype = SDMMC_CTYPE_1BIT;
-
 	switch (ios->bus_width) {
-	case MMC_BUS_WIDTH_1:
-		slot->ctype = SDMMC_CTYPE_1BIT;
-		break;
 	case MMC_BUS_WIDTH_4:
 		slot->ctype = SDMMC_CTYPE_4BIT;
 		break;
 	case MMC_BUS_WIDTH_8:
 		slot->ctype = SDMMC_CTYPE_8BIT;
 		break;
+	default:
+		/* set default 1 bit mode */
+		slot->ctype = SDMMC_CTYPE_1BIT;
 	}
 
 	regs = mci_readl(slot->host, UHS_REG);

Signature · 1 line

1.7.4.1

Seungwon Jeon

Acked-by on v3 2/4

2012-11-27 08:01 UTC #1 lore raw

This is minor change.

Acked-by Seungwon Jeon <[email protected]>

Thanks,
Seungwon Jeon

Quoted 41 lines · Jaehoon Chung

ctype is used 1-bit buswidth mode by default.

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

Signed-off-by Kyungmin Park <[email protected]>

---
 drivers/mmc/host/dw_mmc.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

drivers/mmc/host/dw_mmc.c +3 -7

index a1369aa..0a80b5c 100644
@@ -773,19 +773,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	struct dw_mci_drv_data *drv_data = slot->host->drv_data;
 	u32 regs;
 
-	/* set default 1 bit mode */
-	slot->ctype = SDMMC_CTYPE_1BIT;
-
 	switch (ios->bus_width) {
-	case MMC_BUS_WIDTH_1:
-		slot->ctype = SDMMC_CTYPE_1BIT;
-		break;
 	case MMC_BUS_WIDTH_4:
 		slot->ctype = SDMMC_CTYPE_4BIT;
 		break;
 	case MMC_BUS_WIDTH_8:
 		slot->ctype = SDMMC_CTYPE_8BIT;
 		break;
+	default:
+		/* set default 1 bit mode */
+		slot->ctype = SDMMC_CTYPE_1BIT;
 	}
 
 	regs = mci_readl(slot->host, UHS_REG);
--

1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

James Hogan

Acked-by

2012-11-27 09:42 UTC #2 lore raw

Quoted 6 lines · Seungwon Jeon

This is minor change.
Acked-by Seungwon Jeon <[email protected]>
Thanks,
Seungwon Jeon

Looks good to me too.

Acked-by James Hogan <[email protected]>

Quoted 44 lines · Jaehoon Chung

Quoted 41 lines

ctype is used 1-bit buswidth mode by default.

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

Signed-off-by Kyungmin Park <[email protected]>

---
 drivers/mmc/host/dw_mmc.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

drivers/mmc/host/dw_mmc.c +3 -7

index a1369aa..0a80b5c 100644
@@ -773,19 +773,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	struct dw_mci_drv_data *drv_data = slot->host->drv_data;
 	u32 regs;
 
-	/* set default 1 bit mode */
-	slot->ctype = SDMMC_CTYPE_1BIT;
-
 	switch (ios->bus_width) {
-	case MMC_BUS_WIDTH_1:
-		slot->ctype = SDMMC_CTYPE_1BIT;
-		break;
 	case MMC_BUS_WIDTH_4:
 		slot->ctype = SDMMC_CTYPE_4BIT;
 		break;
 	case MMC_BUS_WIDTH_8:
 		slot->ctype = SDMMC_CTYPE_8BIT;
 		break;
+	default:
+		/* set default 1 bit mode */
+		slot->ctype = SDMMC_CTYPE_1BIT;
 	}
 
 	regs = mci_readl(slot->host, UHS_REG);
--

1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Jae hoon Chung

Acked-by Jaehoon Chung

2012-11-29 15:03 UTC #3 lore raw

Acked-by Jaehoon Chung <[email protected]>

2012/11/27 James Hogan <[email protected]>:

Quoted 60 lines · Seungwon Jeon

Quoted 6 lines
This is minor change.
Acked-by Seungwon Jeon <[email protected]>
Thanks,
Seungwon Jeon
Looks good to me too.
Acked-by James Hogan <[email protected]>
Quoted 36 lines · Jaehoon Chung
Quoted 34 lines
ctype is used 1-bit buswidth mode by default.
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 drivers/mmc/host/dw_mmc.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/mmc/host/dw_mmc.c +3 -6
index a1369aa..0a80b5c 100644
@@ -773,19 +773,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
     struct dw_mci_drv_data *drv_data = slot->host->drv_data;
     u32 regs;
 
-    /* set default 1 bit mode */
-    slot->ctype = SDMMC_CTYPE_1BIT;
-
     switch (ios->bus_width) {
-    case MMC_BUS_WIDTH_1:
-            slot->ctype = SDMMC_CTYPE_1BIT;
-            break;
     case MMC_BUS_WIDTH_4:
             slot->ctype = SDMMC_CTYPE_4BIT;
             break;
     case MMC_BUS_WIDTH_8:
             slot->ctype = SDMMC_CTYPE_8BIT;
             break;
+    default:
+            /* set default 1 bit mode */
+            slot->ctype = SDMMC_CTYPE_1BIT;
     }
 
Quoted 8 lines
Quoted 7 lines
drivers/mmc/host/dw_mmc.c +0 -1
     regs = mci_readl(slot->host, UHS_REG);
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Chris Ball

2012-12-03 19:46 UTC #4 lore raw

In reply to Jaehoon Chung

Hi,

Quoted 4 lines · Jaehoon Chung

ctype is used 1-bit buswidth mode by default.
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

Thanks, pushed to mmc-next for 3.8.

- Chris.

Signature · 2 lines

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