mmc: sdhci-pxav3: remove cd-broken quirk for permanently present card

Flag PXA_FLAG_CARD_PERMANENT is set in sdhci_pxa_platdata flags to
indicate that the card is always wired to host, like on-chip emmc,
which is permanently present and don't need detection.

So only MMC_CAP_NONREMOVABLE should be set for this case. But current
code also sets SDHCI_QUIRK_BROKEN_CARD_DETECTION, which doesn't make
sense.

Signed-off-by: Kevin Liu <kliu5@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 14437fc17d83f7c19265602de0d8431f1f68175f..56d6a2e3194f8e4b24bfa244cc05a8dc3ed3e31e 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -268,11 +268,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
                pdata = pxav3_get_mmc_pdata(dev);
 
        if (pdata) {
-               if (pdata->flags & PXA_FLAG_CARD_PERMANENT) {
-                       /* on-chip device */
-                       host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+               /* on-chip device */
+               if (pdata->flags & PXA_FLAG_CARD_PERMANENT)
                        host->mmc->caps |= MMC_CAP_NONREMOVABLE;
-               }
 
                /* If slot design supports 8 bit data, indicate this to MMC. */
                if (pdata->flags & PXA_FLAG_SD_8_BIT_CAPABLE_SLOT)