Revert "mmc: sdhci-pci: add quirks for broken MSI on O2Micro controll…

…ers" This reverts commit c16e981, because it's no longer useful once MSI support is reverted. Signed-off-by: Chris Ball <[email protected]>
cluon · Apr 6, 2012 · 84e41d2 · 84e41d2
1 parent 93fc5a4
commit 84e41d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
@@ -561,7 +561,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip)
 
 static const struct sdhci_pci_fixes sdhci_o2 = {
 	.probe		= o2_probe,
-	.quirks2	= SDHCI_QUIRK2_BROKEN_MSI,
 };
 
 static const struct sdhci_pci_fixes sdhci_jmicron = {
@@ -1419,8 +1418,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
 
 	slots = chip->num_slots;	/* Quirk may have changed this */
 
-	if (!(chip->quirks2 & SDHCI_QUIRK2_BROKEN_MSI))
-		pci_enable_msi(pdev);
+	pci_enable_msi(pdev);
 
 	for (i = 0; i < slots; i++) {
 		slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);

diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
@@ -91,8 +91,6 @@ struct sdhci_host {
 	unsigned int quirks2;	/* More deviations from spec. */
 
 #define SDHCI_QUIRK2_HOST_OFF_CARD_ON			(1<<0)
-/* broken MSI Interrupts */
-#define SDHCI_QUIRK2_BROKEN_MSI				(1<<1)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */