mmc: host: tmio: SDIO_STATUS_QUIRK is rather SDIO_STATUS_SETBITS

QUIRK sounds like there is something wrong, but actually there are just
some bits which need to be 1. Rename it to be more clear.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 59db14b4827c332ae13209dcd65bdca25d6d8da9..8bebf35c75767ceca29b9bdfcc83650a760f5692 100644 (file)
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -641,10 +641,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
         */
        mmc_data->flags |= TMIO_MMC_HAVE_CMD12_CTRL;
 
-       /*
-        * All SDHI need SDIO_INFO1 reserved bit
-        */
-       mmc_data->flags |= TMIO_MMC_SDIO_STATUS_QUIRK;
+       /* All SDHI have SDIO status bits which must be 1 */
+       mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;
 
        ret = tmio_mmc_host_probe(host, mmc_data);
        if (ret < 0)

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 7cbfec7a5d947cf3b20cb1735867db503fa67789..6e1acb628edc9412fd7e68500ab623cb97824c0e 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -723,7 +723,7 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)
        ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask;
 
        sdio_status = status & ~TMIO_SDIO_MASK_ALL;
-       if (pdata->flags & TMIO_MMC_SDIO_STATUS_QUIRK)
+       if (pdata->flags & TMIO_MMC_SDIO_STATUS_SETBITS)
                sdio_status |= 6;
 
        sd_ctrl_write16(host, CTL_SDIO_STATUS, sdio_status);

diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index fba44abd05ba1a9dd4e8c802b6d60fd18766f05e..a1520d88ebf3a3465532ede9255f9e21580b56e8 100644 (file)
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -94,10 +94,8 @@
  */
 #define TMIO_MMC_HAVE_CMD12_CTRL       (1 << 7)
 
-/*
- * Some controllers needs to set 1 on SDIO status reserved bits
- */
-#define TMIO_MMC_SDIO_STATUS_QUIRK     (1 << 8)
+/* Controller has some SDIO status bits which must be 1 */
+#define TMIO_MMC_SDIO_STATUS_SETBITS   (1 << 8)
 
 /*
  * Some controllers have a 32-bit wide data port register