Skip to contentSkip to conversation

mmc: dw_mmc: Clean up variable name

PATCH New Michael Trimarchi 2 participants 3 messages Sep 15, 2019 – Sep 17, 2019 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: dw_mmc: Clean up variable name

---
 drivers/mmc/dw_mmc.c | 4 ++--
 include/dwmmc.h      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/dw_mmc.c +2 -2
index ebe7bcdd90..e5b532a862 100644
@@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host *host,
 	flush_dcache_range(data_start, roundup(data_end, ARCH_DMA_MINALIGN));
 
 	ctrl = dwmci_readl(host, DWMCI_CTRL);
-	ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN;
+	ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN;
 	dwmci_writel(host, DWMCI_CTRL, ctrl);
 
 	ctrl = dwmci_readl(host, DWMCI_BMOD);
@@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 			dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK);
 
 			ctrl = dwmci_readl(host, DWMCI_CTRL);
-			ctrl &= ~(DWMCI_DMA_EN);
+			ctrl &= ~(DWMCI_CTRL_DMA_EN);
 			dwmci_writel(host, DWMCI_CTRL, ctrl);
 			bounce_buffer_stop(&bbstate);
 		}
include/dwmmc.h +2 -2
index f06720dc0d..2f57b6e774 100644
@@ -75,9 +75,9 @@
 #define DWMCI_CTRL_RESET	(1 << 0)
 #define DWMCI_CTRL_FIFO_RESET	(1 << 1)
 #define DWMCI_CTRL_DMA_RESET	(1 << 2)
-#define DWMCI_DMA_EN		(1 << 5)
+#define DWMCI_CTRL_DMA_EN	(1 << 5)
 #define DWMCI_CTRL_SEND_AS_CCSD	(1 << 10)
-#define DWMCI_IDMAC_EN		(1 << 25)
+#define DWMCI_CTRL_USE_IDMAC	(1 << 25)
 #define DWMCI_RESET_ALL		(DWMCI_CTRL_RESET | DWMCI_CTRL_FIFO_RESET |\
 				DWMCI_CTRL_DMA_RESET)
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 mmc: dw_mmc: Clean up variable name

Quoted 1 line

Subject: [PATCH] mmc: dw_mmc: Clean up variable name

Please at least write some commit message here.

Thanks,
Peng.

Quoted 51 lines
---
 drivers/mmc/dw_mmc.c | 4 ++--
 include/dwmmc.h      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/dw_mmc.c index renamed from drivers/mmc/dw_mmc.c +0 -0

ebe7bcdd90..e5b532a862 100644

drivers/mmc/dw_mmc.c +1 -1
@@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host
 *host,
 	flush_dcache_range(data_start, roundup(data_end,
 ARCH_DMA_MINALIGN));
 
 	ctrl = dwmci_readl(host, DWMCI_CTRL);
-	ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN;
+	ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN;
 	dwmci_writel(host, DWMCI_CTRL, ctrl);
drivers/mmc/dw_mmc.c +1 -1
 	ctrl = dwmci_readl(host, DWMCI_BMOD);
@@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
 mmc_cmd *cmd,
 			dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK);
 
 			ctrl = dwmci_readl(host, DWMCI_CTRL);
-			ctrl &= ~(DWMCI_DMA_EN);
+			ctrl &= ~(DWMCI_CTRL_DMA_EN);
 			dwmci_writel(host, DWMCI_CTRL, ctrl);
 			bounce_buffer_stop(&bbstate);
drivers/mmc/dw_mmc.c +0 -0
 		}
include/dwmmc.h index renamed from include/dwmmc.h +0 -0

f06720dc0d..2f57b6e774 100644

include/dwmmc.h +2 -3
@@ -75,9 +75,9 @@
 #define DWMCI_CTRL_RESET	(1 << 0)
 #define DWMCI_CTRL_FIFO_RESET	(1 << 1)
 #define DWMCI_CTRL_DMA_RESET	(1 << 2)
-#define DWMCI_DMA_EN		(1 << 5)
+#define DWMCI_CTRL_DMA_EN	(1 << 5)
 #define DWMCI_CTRL_SEND_AS_CCSD	(1 << 10)
-#define DWMCI_IDMAC_EN		(1 << 25)
+#define DWMCI_CTRL_USE_IDMAC	(1 << 25)
 #define DWMCI_RESET_ALL		(DWMCI_CTRL_RESET |
 DWMCI_CTRL_FIFO_RESET |\
 				DWMCI_CTRL_DMA_RESET)
 
--

2.17.1

#2 lore raw

PATCH 1/1 mmc: dw_mmc: Clean up variable name

Hi

Quoted 3 lines · Peng Fan
Quoted 2 lines

Subject: [PATCH] mmc: dw_mmc: Clean up variable name

I will resend.

Michael

Quoted 57 lines

Please at least write some commit message here.

Thanks,
Peng.

Quoted 51 lines
---
 drivers/mmc/dw_mmc.c | 4 ++--
 include/dwmmc.h      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/dw_mmc.c index renamed from drivers/mmc/dw_mmc.c +0 -0

ebe7bcdd90..e5b532a862 100644

drivers/mmc/dw_mmc.c +1 -1
@@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host
 *host,
      flush_dcache_range(data_start, roundup(data_end,
 ARCH_DMA_MINALIGN));
 
      ctrl = dwmci_readl(host, DWMCI_CTRL);
-     ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN;
+     ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN;
      dwmci_writel(host, DWMCI_CTRL, ctrl);
      ctrl = dwmci_readl(host, DWMCI_BMOD);
drivers/mmc/dw_mmc.c +1 -1
@@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
 mmc_cmd *cmd,
                      dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK);
 
                      ctrl = dwmci_readl(host, DWMCI_CTRL);
-                     ctrl &= ~(DWMCI_DMA_EN);
+                     ctrl &= ~(DWMCI_CTRL_DMA_EN);
                      dwmci_writel(host, DWMCI_CTRL, ctrl);
                      bounce_buffer_stop(&bbstate);
              }
include/dwmmc.h index renamed from include/dwmmc.h +0 -0

f06720dc0d..2f57b6e774 100644

include/dwmmc.h +2 -3
@@ -75,9 +75,9 @@
 #define DWMCI_CTRL_RESET     (1 << 0)
 #define DWMCI_CTRL_FIFO_RESET        (1 << 1)
 #define DWMCI_CTRL_DMA_RESET (1 << 2)
-#define DWMCI_DMA_EN         (1 << 5)
+#define DWMCI_CTRL_DMA_EN    (1 << 5)
 #define DWMCI_CTRL_SEND_AS_CCSD      (1 << 10)
-#define DWMCI_IDMAC_EN               (1 << 25)
+#define DWMCI_CTRL_USE_IDMAC (1 << 25)
 #define DWMCI_RESET_ALL              (DWMCI_CTRL_RESET |
 DWMCI_CTRL_FIFO_RESET |\
                              DWMCI_CTRL_DMA_RESET)
 
--

2.17.1

Signature · 4 lines
| Michael Nazzareno Trimarchi                     Amarula Solutions BV |
| COO  -  Founder                                      Cruquiuskade 47 |
| +31(0)851119172                                 Amsterdam 1018 AM NL |
|                  [`as] http://www.amarulasolutions.com               |