diff mbox

[3/4] mmc: sdhci-esdhc-imx: remove "WP" from flag ESDHC_FLAG_GPIO_FOR_CD_WP

Message ID 1307702572-22066-4-git-send-email-shawn.guo@linaro.org
State Superseded
Headers show

Commit Message

Shawn Guo June 10, 2011, 10:42 a.m. UTC 
The use of flag ESDHC_FLAG_GPIO_FOR_CD_WP is all CD related.  It does
not necessarily need to bother WP in the flag name.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Comments

Wolfram Sang June 14, 2011, 9:28 a.m. UTC | #1 
On Fri, Jun 10, 2011 at 06:42:51PM +0800, Shawn Guo wrote:
> The use of flag ESDHC_FLAG_GPIO_FOR_CD_WP is all CD related.  It does
> not necessarily need to bother WP in the flag name.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

I'd just squash it into the next one?
Shawn Guo June 14, 2011, 11:51 a.m. UTC | #2 
On Tue, Jun 14, 2011 at 11:28:13AM +0200, Wolfram Sang wrote:
> On Fri, Jun 10, 2011 at 06:42:51PM +0800, Shawn Guo wrote:
> > The use of flag ESDHC_FLAG_GPIO_FOR_CD_WP is all CD related.  It does
> > not necessarily need to bother WP in the flag name.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> 
> I'd just squash it into the next one?
> 
I'd like to have this patch to give the exact meaning of the flag,
and then the following patch removes the flag with proper CD only
case handling.
diff mbox

Patch

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 94097c0..79b7a9a 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -29,7 +29,7 @@ 
 #define SDHCI_VENDOR_SPEC		0xC0
 #define  SDHCI_VENDOR_SPEC_SDIO_QUIRK	0x00000002
 
-#define ESDHC_FLAG_GPIO_FOR_CD_WP	(1 << 0)
+#define ESDHC_FLAG_GPIO_FOR_CD		(1 << 0)
 /*
  * The CMDTYPE of the CMD register (offset 0xE) should be set to
  * "11" when the STOP CMD12 is issued on imx53 to abort one
@@ -77,7 +77,7 @@  static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 	u32 val = readl(host->ioaddr + reg);
 
 	if (unlikely((reg == SDHCI_PRESENT_STATE)
-			&& (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD_WP))) {
+			&& (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD))) {
 		struct esdhc_platform_data *boarddata =
 				host->mmc->parent->platform_data;
 
@@ -99,7 +99,7 @@  static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 	struct pltfm_imx_data *imx_data = pltfm_host->priv;
 
 	if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)
-			&& (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD_WP)))
+			&& (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD)))
 		/*
 		 * these interrupts won't work with a custom card_detect gpio
 		 * (only applied to mx25/35)
@@ -308,7 +308,7 @@  static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
 			goto no_card_detect_irq;
 		}
 
-		imx_data->flags |= ESDHC_FLAG_GPIO_FOR_CD_WP;
+		imx_data->flags |= ESDHC_FLAG_GPIO_FOR_CD;
 		/* Now we have a working card_detect again */
 		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 	}