From owner-linux-pci@atrey.karlin.mff.cuni.cz Thu Jul 13 11:00:38 2006 Message-Id: <20060713165609.496495000@myri.com> Date: Thu, 13 Jul 2006 12:56:16 -0400 From: Brice Goglin To: linux-pci@atrey.karlin.mff.cuni.cz Cc: Brice Goglin Subject: MSI: Drop pci_msi_quirk Content-Disposition: inline; filename=msi-08-drop_pci_msi_quirk.patch 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 Signed-off-by: Greg Kroah-Hartman --- drivers/pci/msi.c | 7 ------- drivers/pci/pci.h | 5 ----- drivers/pci/quirks.c | 2 -- 3 files changed, 14 deletions(-) --- gregkh-2.6.orig/drivers/pci/msi.c +++ gregkh-2.6/drivers/pci/msi.c @@ -351,13 +351,6 @@ static int msi_init(void) 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; --- gregkh-2.6.orig/drivers/pci/pci.h +++ gregkh-2.6/drivers/pci/pci.h @@ -42,11 +42,6 @@ extern void pci_remove_legacy_files(stru /* 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 extern unsigned int pci_pm_d3_delay; #ifdef CONFIG_PCI_MSI void disable_msi_mode(struct pci_dev *dev, int pos, int type); --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c @@ -576,8 +576,6 @@ static void __init quirk_ioapic_rmw(stru } 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