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

This reverts commit c16e981b2fd9455af670a69a84f4c8cf07e12658, because
it's no longer useful once MSI support is reverted.

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 9303f7fc1e6847342bc9a416b80aff3b07816a89..fbbebe251e016cf8b24906aa6a0b4ad31f64cd40 100644 (file)
--- 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
index 9752fe434ae9832380e61826bf3ae71598b7126a..e9051e1cb1ce38434d0443cfee5c7c74e43a1967 100644 (file)
--- 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 */