mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION

Even if a driver provides separate card detection, an interrupt
is still needed to abort mmc requests that are in progress.
SDHCI_QUIRK2_OWN_CARD_DETECTION prevents that, so remove it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 646680a5993acf65d6f5bf89f0dcc6a6f4f219a1..83a152e9b9763058246b06e5dca3a5defe550ff5 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -212,7 +212,6 @@ static void sdhci_pci_add_own_cd(struct sdhci_pci_slot *slot)
 
        slot->cd_gpio = gpio;
        slot->cd_irq = irq;
-       slot->host->quirks2 |= SDHCI_QUIRK2_OWN_CARD_DETECTION;
 
        return;
 

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e6c6cd6e95f2303f8c43515ea2b0c001c5b4c211..6f1fd02fe01b08467f9c24067d28336528c6a177 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -147,7 +147,6 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
        u32 present, irqs;
 
        if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||
-           (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) ||
            !mmc_card_is_removable(host->mmc))
                return;
 

diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index e4b69353678d0c69a97af270e02911e756f44863..dad7a469f09c557f98a548ba021c7ce15fcb1d0f 100644 (file)
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -90,8 +90,6 @@ struct sdhci_host {
 
        unsigned int quirks2;   /* More deviations from spec. */
 
-#define SDHCI_QUIRK2_OWN_CARD_DETECTION                        (1<<0)
-
        int irq;                /* Device IRQ */
        void __iomem *ioaddr;   /* Mapped address */