1 files changed, 3 insertions, 40 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 50f2dd9e1bb2..59d4da2734c1 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -472,11 +472,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH8_3, quirk_
  */
 static void __devinit quirk_vt82c586_acpi(struct pci_dev *dev)
 {
-        u8 rev;
         u32 region;
 
-        pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
-        if (rev & 0x10) {
+        if (dev->revision & 0x10) {
                 pci_read_config_dword(dev, 0x48, &region);
                 region &= PCI_BASE_ADDRESS_IO_MASK;
                 quirk_io_region(dev, region, 256, PCI_BRIDGE_RESOURCES, "vt82c586 ACPI");
@@ -629,12 +627,9 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk
  */
 static void __init quirk_amd_8131_mmrbc(struct pci_dev *dev)
 {
-        unsigned char revid;
-
-        pci_read_config_byte(dev, PCI_REVISION_ID, &revid);
-        if (dev->subordinate && revid <= 0x12) {
+        if (dev->subordinate && dev->revision <= 0x12) {
                 printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X "
-                                "MMRBC\n", revid);
+                                "MMRBC\n", dev->revision);
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
         }
 }
@@ -930,38 +925,6 @@ static void __init quirk_eisa_bridge(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82375,      quirk_eisa_bridge );
 
-/*
- * On the MSI-K8T-Neo2Fir Board, the internal Soundcard is disabled
- * when a PCI-Soundcard is added. The BIOS only gives Options
- * "Disabled" and "AUTO". This Quirk Sets the corresponding
- * Register-Value to enable the Soundcard.
- *
- * FIXME: Presently this quirk will run on anything that has an 8237
- * which isn't correct, we need to check DMI tables or something in
- * order to make sure it only runs on the MSI-K8T-Neo2Fir.  Because it
- * runs everywhere at present we suppress the printk output in most
- * irrelevant cases.
- */
-static void k8t_sound_hostbridge(struct pci_dev *dev)
-{
-        unsigned char val;
-
-        pci_read_config_byte(dev, 0x50, &val);
-        if (val == 0xc8) {
-                /* Assume it's probably a MSI-K8T-Neo2Fir */
-                printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, attempting to turn soundcard ON\n");
-                pci_write_config_byte(dev, 0x50, val & (~0x40));
-
-                /* Verify the Change for Status output */
-                pci_read_config_byte(dev, 0x50, &val);
-                if (val & 0x40)
-                        printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, soundcard still off\n");
-                else
-                        printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, soundcard on\n");
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
 
 /*
  * On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge