[patch 6/7] Drop pci_msi_quirk

From: Brice Goglin
Date: Sun Jul 02 2006 - 20:50:49 EST


pci_msi_quirk is not used anymore, the no_msi flag in the pci_dev
structure of the chipset should be preferred.
Drop pci_msi_quirk completely.

Signed-off-by: Brice Goglin <brice@xxxxxxxx>
---
drivers/pci/msi.c | 7 -------
drivers/pci/pci.h | 6 ------
drivers/pci/quirks.c | 2 --
3 files changed, 15 deletions(-)

Index: linux-git/drivers/pci/msi.c
===================================================================
--- linux-git.orig/drivers/pci/msi.c 2006-07-02 11:39:56.000000000 -0400
+++ linux-git/drivers/pci/msi.c 2006-07-02 11:56:48.000000000 -0400
@@ -351,13 +351,6 @@
if (!status)
return status;

- if (pci_msi_quirk) {
- pci_msi_enable = 0;
- printk(KERN_WARNING "PCI: MSI quirk detected. MSI disabled.\n");
- status = -EINVAL;
- return status;
- }
-
status = msi_arch_init();
if (status < 0) {
pci_msi_enable = 0;
Index: linux-git/drivers/pci/pci.h
===================================================================
--- linux-git.orig/drivers/pci/pci.h 2006-07-02 11:16:08.000000000 -0400
+++ linux-git/drivers/pci/pci.h 2006-07-02 11:56:48.000000000 -0400
@@ -42,12 +42,6 @@
/* Lock for read/write access to pci device and bus lists */
extern struct rw_semaphore pci_bus_sem;

-#ifdef CONFIG_X86_IO_APIC
-extern int pci_msi_quirk;
-#else
-#define pci_msi_quirk 0
-#endif
-
#ifdef CONFIG_PCI_MSI
void disable_msi_mode(struct pci_dev *dev, int pos, int type);
void pci_no_msi(void);
Index: linux-git/drivers/pci/quirks.c
===================================================================
--- linux-git.orig/drivers/pci/quirks.c 2006-07-02 11:54:01.000000000 -0400
+++ linux-git/drivers/pci/quirks.c 2006-07-02 11:56:48.000000000 -0400
@@ -575,8 +575,6 @@
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw );

-int pci_msi_quirk;
-
#define AMD8131_revA0 0x01
#define AMD8131_revB0 0x11
#define AMD8131_MISC 0x40

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/