Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84e41d2d authored by Chris Ball's avatar Chris Ball
Browse files

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: default avatarChris Ball <cjb@laptop.org>
parent 93fc5a47

drivers/mmc/host/sdhci-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -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,7 +1418,6 @@ 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);



	for (i = 0; i < slots; i++) {

include/linux/mmc/sdhci.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */