Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.

1 files changed, 10 insertions, 31 deletions

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 11aaf2fdec84..8f18dd090a66 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -36,9 +36,15 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
 {
         static int next_busno;
         static int need_domain_info;
+        LIST_HEAD(resources);
+        int i;
         struct pci_bus *bus;
 
-        bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
+        for (i = 0; i < hose->nr_resources; i++)
+                pci_add_resource(&resources, hose->resources + i);
+
+        bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
+                                &resources);
         hose->bus = bus;
 
         need_domain_info = need_domain_info || hose->index;
@@ -55,6 +61,8 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
                 pci_bus_size_bridges(bus);
                 pci_bus_assign_resources(bus);
                 pci_enable_bridges(bus);
+        } else {
+                pci_free_resource_list(&resources);
         }
 }
 
@@ -162,16 +170,8 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev,
  */
 void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 {
-        struct pci_dev *dev = bus->self;
+        struct pci_dev *dev;
         struct list_head *ln;
-        struct pci_channel *hose = bus->sysdata;
-
-        if (!dev) {
-                int i;
-
-                for (i = 0; i < hose->nr_resources; i++)
-                        bus->resource[i] = hose->resources + i;
-        }
 
         for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
                 dev = pci_dev_b(ln);
@@ -243,27 +243,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return pci_enable_resources(dev, mask);
 }
 
-/*
- *  If we set up a device for bus mastering, we need to check and set
- *  the latency timer as it may not be properly set.
- */
-static unsigned int pcibios_max_latency = 255;
-
-void pcibios_set_master(struct pci_dev *dev)
-{
-        u8 lat;
-        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
-        if (lat < 16)
-                lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;
-        else if (lat > pcibios_max_latency)
-                lat = pcibios_max_latency;
-        else
-                return;
-        printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n",
-               pci_name(dev), lat);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
-}
-
 void __init pcibios_update_irq(struct pci_dev *dev, int irq)
 {
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);