From: Kevin Liu Date: Mon, 25 Mar 2013 09:42:57 +0000 (+0800) Subject: mmc: sdhci-pxav3: remove cd-broken quirk for permanently present card X-Git-Tag: next-20130422~59^2~23 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c844a46f135e493ffda0bd770e16f6c3dd6c7eb7;p=karo-tx-linux.git 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 Acked-by: Haojian Zhuang Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 14437fc17d83..56d6a2e3194f 100644 --- 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)