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>
git-mirror · Jan 12, 2012 · e2a0a58 · e2a0a58
1 parent c5e027a
commit e2a0a58
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 */
-Original file line number
+Diff line change
@@ Expand Up @@
     	slot->cd_gpio = gpio;
     	slot->cd_irq = irq;
-    	slot->host->quirks2 |= SDHCI_QUIRK2_OWN_CARD_DETECTION;
     	return;
@@ Expand Down @@