提交 84e41d2d 编写于 作者: C Chris Ball

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: NChris Ball <cjb@laptop.org>
上级 93fc5a47
...@@ -561,7 +561,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) ...@@ -561,7 +561,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip)
static const struct sdhci_pci_fixes sdhci_o2 = { static const struct sdhci_pci_fixes sdhci_o2 = {
.probe = o2_probe, .probe = o2_probe,
.quirks2 = SDHCI_QUIRK2_BROKEN_MSI,
}; };
static const struct sdhci_pci_fixes sdhci_jmicron = { static const struct sdhci_pci_fixes sdhci_jmicron = {
...@@ -1419,8 +1418,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, ...@@ -1419,8 +1418,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
slots = chip->num_slots; /* Quirk may have changed this */ 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++) { for (i = 0; i < slots; i++) {
slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);
......
...@@ -91,8 +91,6 @@ struct sdhci_host { ...@@ -91,8 +91,6 @@ struct sdhci_host {
unsigned int quirks2; /* More deviations from spec. */ unsigned int quirks2; /* More deviations from spec. */
#define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0)
/* broken MSI Interrupts */
#define SDHCI_QUIRK2_BROKEN_MSI (1<<1)
int irq; /* Device IRQ */ int irq; /* Device IRQ */
void __iomem *ioaddr; /* Mapped address */ void __iomem *ioaddr; /* Mapped address */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册