From f2e89776e6a24ea4a320f0c4bf6b25b081940365 Mon Sep 17 00:00:00 2001 From: Chris Ball Date: Tue, 3 Apr 2012 16:47:55 -0400 Subject: [PATCH] --- yaml --- r: 298813 b: refs/heads/master c: 84e41d2d56fbacfd888ab1382e94e752da176582 h: refs/heads/master i: 298811: 8ab2c15184df7d78cc4d70a088ce3f4b2b025efd v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 4 +--- trunk/include/linux/mmc/sdhci.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d99339cf7ba9..745961cda25e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93fc5a47f25c41125b30c0bf4f243bf3204a1a0a +refs/heads/master: 84e41d2d56fbacfd888ab1382e94e752da176582 diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index 9303f7fc1e68..fbbebe251e01 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/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/trunk/include/linux/mmc/sdhci.h b/trunk/include/linux/mmc/sdhci.h index 9752fe434ae9..e9051e1cb1ce 100644 --- a/trunk/include/linux/mmc/sdhci.h +++ b/trunk/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 */