Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (42 commits)
  PCI: Change PCI subsystem MAINTAINER
  PCI: pci-iommu-iotlb-flushing-speedup
  PCI: pci_setup_bridge() mustn't be __devinit
  PCI: pci_bus_size_cardbus() mustn't be __devinit
  PCI: pci_scan_device() mustn't be __devinit
  PCI: pci_alloc_child_bus() mustn't be __devinit
  PCI: replace remaining __FUNCTION__ occurrences
  PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
  PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
  PCI: clean up resource alignment management
  PCI: aerdrv_acpi.c: remove unneeded NULL check
  PCI: Update VIA CX700 quirk
  PCI: Expose PCI VPD through sysfs
  PCI: iommu: iotlb flushing
  PCI: simplify quirk debug output
  PCI: iova RB tree setup tweak
  PCI: parisc: use generic pci_enable_resources()
  PCI: ppc: use generic pci_enable_resources()
  PCI: powerpc: use generic pci_enable_resources()
  PCI: ia64: use generic pci_enable_resources()
  ...

1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e887aa45c9cd..afd914ebe215 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1502,8 +1502,8 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
                 if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
                     (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
 #ifdef DEBUG
-                        dev_dbg(&dev->dev, "calling quirk 0x%p", f->hook);
-                        print_fn_descriptor_symbol(": %s()\n",
+                        dev_dbg(&dev->dev, "calling ");
+                        print_fn_descriptor_symbol("%s()\n",
                                 (unsigned long) f->hook);
 #endif
                         f->hook(dev);
@@ -1648,13 +1648,24 @@ static void __devinit quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
                         /* Turn off PCI Bus Parking */
                         pci_write_config_byte(dev, 0x76, b ^ 0x40);
 
+                        dev_info(&dev->dev,
+                                "Disabling VIA CX700 PCI parking\n");
+                }
+        }
+
+        if (pci_read_config_byte(dev, 0x72, &b) == 0) {
+                if (b != 0) {
                         /* Turn off PCI Master read caching */
                         pci_write_config_byte(dev, 0x72, 0x0);
+
+                        /* Set PCI Master Bus time-out to "1x16 PCLK" */
                         pci_write_config_byte(dev, 0x75, 0x1);
+
+                        /* Disable "Read FIFO Timer" */
                         pci_write_config_byte(dev, 0x77, 0x0);
 
                         dev_info(&dev->dev,
-                                "Disabling VIA CX700 PCI parking/caching\n");
+                                "Disabling VIA CX700 PCI caching\n");
                 }
         }
 }