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()
  ...

16 files changed, 27 insertions, 420 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 9dc1cee43265..c107cc08daf4 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -372,28 +372,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
 int
 pcibios_enable_device(struct pci_dev *dev, int mask)
 {
-        u16 cmd, oldcmd;
-        int i;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        oldcmd = cmd;
-
-        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                struct resource *res = &dev->resource[i];
-
-                if (res->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                else if (res->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-
-        if (cmd != oldcmd) {
-                printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n",
-                       pci_name(dev), cmd);
-                /* Enable the appropriate bits in the PCI command register.  */
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
+        return pci_enable_resources(dev, mask);
 }
 
 /*
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index 7481797ab382..0c7bf39dc729 100644
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -17,8 +17,6 @@
 #define PCI_PROBE_BIOS          0x0001
 #define PCI_PROBE_CONF1         0x0002
 #define PCI_PROBE_CONF2         0x0004
-#define PCI_NO_SORT             0x0100
-#define PCI_BIOS_SORT           0x0200
 #define PCI_NO_CHECKS           0x0400
 #define PCI_ASSIGN_ROMS         0x1000
 #define PCI_BIOS_IRQ_SCAN       0x2000
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 6d51f133fb23..f003cfa68b7a 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -199,58 +199,6 @@ static struct pci_ops * __init pci_check_direct(void)
 }
 
 /*
- * Several buggy motherboards address only 16 devices and mirror
- * them to next 16 IDs. We try to detect this `feature' on all
- * primary buses (those containing host bridges as they are
- * expected to be unique) and remove the ghost devices.
- */
-
-static void __init pcibios_fixup_ghosts(struct pci_bus *b)
-{
-        struct list_head *ln, *mn;
-        struct pci_dev *d, *e;
-        int mirror = PCI_DEVFN(16,0);
-        int seen_host_bridge = 0;
-        int i;
-
-        for (ln=b->devices.next; ln != &b->devices; ln=ln->next) {
-                d = pci_dev_b(ln);
-                if ((d->class >> 8) == PCI_CLASS_BRIDGE_HOST)
-                        seen_host_bridge++;
-                for (mn=ln->next; mn != &b->devices; mn=mn->next) {
-                        e = pci_dev_b(mn);
-                        if (e->devfn != d->devfn + mirror ||
-                            e->vendor != d->vendor ||
-                            e->device != d->device ||
-                            e->class != d->class)
-                                continue;
-                        for(i=0; i<PCI_NUM_RESOURCES; i++)
-                                if (e->resource[i].start != d->resource[i].start ||
-                                    e->resource[i].end != d->resource[i].end ||
-                                    e->resource[i].flags != d->resource[i].flags)
-                                        continue;
-                        break;
-                }
-                if (mn == &b->devices)
-                        return;
-        }
-        if (!seen_host_bridge)
-                return;
-        printk("PCI: Ignoring ghost devices on bus %02x\n", b->number);
-
-        ln = &b->devices;
-        while (ln->next != &b->devices) {
-                d = pci_dev_b(ln->next);
-                if (d->devfn >= mirror) {
-                        list_del(&d->global_list);
-                        list_del(&d->bus_list);
-                        kfree(d);
-                } else
-                        ln = ln->next;
-        }
-}
-
-/*
  * Discover remaining PCI buses in case there are peer host bridges.
  * We use the number of last PCI bus provided by the PCI BIOS.
  */
@@ -356,7 +304,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 #if 0
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
 #endif
-        pcibios_fixup_ghosts(bus);
         pci_read_bridge_bases(bus);
 
         if (bus->number == 0) {
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 53d0a8ee35d7..77b15f80f101 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -504,54 +504,12 @@ pcibios_update_irq (struct pci_dev *dev, int irq)
         /* ??? FIXME -- record old value for shutdown.  */
 }
 
-static inline int
-pcibios_enable_resources (struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-        unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-
-        if (!dev)
-                return -EINVAL;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx=0; idx<PCI_NUM_RESOURCES; idx++) {
-                /* Only set up the desired resources.  */
-                if (!(mask & (1 << idx)))
-                        continue;
-
-                r = &dev->resource[idx];
-                if (!(r->flags & type_mask))
-                        continue;
-                if ((idx == PCI_ROM_RESOURCE) &&
-                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
-                        continue;
-                if (!r->start && r->end) {
-                        printk(KERN_ERR
-                               "PCI: Device %s not available because of resource collisions\n",
-                               pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
 int
 pcibios_enable_device (struct pci_dev *dev, int mask)
 {
         int ret;
 
-        ret = pcibios_enable_resources(dev, mask);
+        ret = pci_enable_resources(dev, mask);
         if (ret < 0)
                 return ret;
 
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h
index 84634fa3bce6..9763d1ce343a 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.h
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.h
@@ -23,8 +23,6 @@
 #define PCI_PROBE_BIOS 1
 #define PCI_PROBE_CONF1 2
 #define PCI_PROBE_CONF2 4
-#define PCI_NO_SORT 0x100
-#define PCI_BIOS_SORT 0x200
 #define PCI_NO_CHECKS 0x400
 #define PCI_ASSIGN_ROMS 0x1000
 #define PCI_BIOS_IRQ_SCAN 0x2000
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 507d0ac99f66..6936386c9861 100644
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -287,23 +287,15 @@ void pcibios_align_resource(void *data, struct resource *res,
  */
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
-        u16 cmd;
-        int idx;
+        int err;
+        u16 cmd, old_cmd;
 
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-
-        for (idx = 0; idx < DEVICE_COUNT_RESOURCE; idx++) {
-                struct resource *r = &dev->resource[idx];
+        err = pci_enable_resources(dev, mask);
+        if (err < 0)
+                return err;
 
-                /* only setup requested resources */
-                if (!(mask & (1<<idx)))
-                        continue;
-
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
+        pci_read_config_word(dev, PCI_COMMAND, &cmd);
+        old_cmd = cmd;
 
         cmd |= (PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
 
@@ -312,8 +304,12 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         if (dev->bus->bridge_ctl & PCI_BRIDGE_CTL_FAST_BACK)
                 cmd |= PCI_COMMAND_FAST_BACK;
 #endif
-        DBGC("PCIBIOS: Enabling device %s cmd 0x%04x\n", pci_name(dev), cmd);
-        pci_write_config_word(dev, PCI_COMMAND, cmd);
+
+        if (cmd != old_cmd) {
+                dev_info(&dev->dev, "enabling SERR and PARITY (%04x -> %04x)\n",
+                        old_cmd, cmd);
+                pci_write_config_word(dev, PCI_COMMAND, cmd);
+        }
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 89c83ccb85c1..063cdd413049 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1161,41 +1161,9 @@ EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
 
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
         if (ppc_md.pcibios_enable_device_hook)
                 if (ppc_md.pcibios_enable_device_hook(dev))
                         return -EINVAL;
 
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
-                /* Only set up the requested stuff */
-                if (!(mask & (1 << idx)))
-                        continue;
-                r = &dev->resource[idx];
-                if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
-                        continue;
-                if ((idx == PCI_ROM_RESOURCE) &&
-                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
-                        continue;
-                if (r->parent == NULL) {
-                        printk(KERN_ERR "PCI: Device %s not available because"
-                               " of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n",
-                       pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
+        return pci_enable_resources(dev, mask);
 }
-
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 0d7229cde0e9..21a6d55418f1 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -88,11 +88,8 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus)
         struct pci_dev *dev;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
-                /*
-                 * Skip already-present devices (which are on the
-                 * global device list.)
-                 */
-                if (list_empty(&dev->global_list)) {
+                /* Skip already-added devices */
+                if (!dev->is_added) {
                         int i;
 
                         /* Fill device archdata and setup iommu table */
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index c2ec13bea006..50ce83f20adb 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -578,39 +578,6 @@ pcibios_assign_resources(void)
 }
 
 
-int
-pcibios_enable_resources(struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx=0; idx<6; idx++) {
-                /* Only set up the requested stuff */
-                if (!(mask & (1<<idx)))
-                        continue;
-        
-                r = &dev->resource[idx];
-                if (r->flags & IORESOURCE_UNSET) {
-                        printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (dev->resource[PCI_ROM_RESOURCE].start)
-                cmd |= PCI_COMMAND_MEMORY;
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
 static int next_controller_index;
 
 struct pci_controller * __init
@@ -785,33 +752,11 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
 
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
         if (ppc_md.pcibios_enable_device_hook)
                 if (ppc_md.pcibios_enable_device_hook(dev, 0))
                         return -EINVAL;
-                
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx=0; idx<6; idx++) {
-                r = &dev->resource[idx];
-                if (r->flags & IORESOURCE_UNSET) {
-                        printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n",
-                       pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
+
+        return pci_enable_resources(dev, mask);
 }
 
 struct pci_controller*
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index 07e29506080f..a83dcf70c13b 100644
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -15,8 +15,6 @@
 #define PCI_PROBE_BIOS          1
 #define PCI_PROBE_CONF1         2
 #define PCI_PROBE_CONF2         4
-#define PCI_NO_SORT             0x100
-#define PCI_BIOS_SORT           0x200
 #define PCI_NO_CHECKS           0x400
 #define PCI_ASSIGN_ROMS         0x1000
 #define PCI_BIOS_IRQ_SCAN       0x2000
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index adb91e4b62da..2edee22e9c30 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -1233,8 +1233,7 @@ static int __init calgary_init(void)
 
 error:
         do {
-                dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
-                                             PCI_ANY_ID, dev);
+                dev = pci_get_device(PCI_VENDOR_ID_IBM, PCI_ANY_ID, dev);
                 if (!dev)
                         break;
                 if (!is_cal_pci_dev(dev->device))
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 378136fb5044..2664cb3fc96c 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -151,7 +151,7 @@ adjust_transparent_bridge_resources(struct pci_bus *bus)
 
 static void
 get_current_resources(struct acpi_device *device, int busnum,
-                        struct pci_bus *bus)
+                        int domain, struct pci_bus *bus)
 {
         struct pci_root_info info;
         size_t size;
@@ -168,10 +168,10 @@ get_current_resources(struct acpi_device *device, int busnum,
         if (!info.res)
                 goto res_alloc_fail;
 
-        info.name = kmalloc(12, GFP_KERNEL);
+        info.name = kmalloc(16, GFP_KERNEL);
         if (!info.name)
                 goto name_alloc_fail;
-        sprintf(info.name, "PCI Bus #%02x", busnum);
+        sprintf(info.name, "PCI Bus %04x:%02x", domain, busnum);
 
         info.res_num = 0;
         acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
@@ -247,7 +247,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
 #endif
 
         if (bus && (pci_probe & PCI_USE__CRS))
-                get_current_resources(device, busnum, bus);
+                get_current_resources(device, busnum, domain, bus);
         
         return bus;
 }
@@ -278,8 +278,7 @@ static int __init pci_acpi_init(void)
                 printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n");
                 for_each_pci_dev(dev)
                         acpi_pci_irq_enable(dev);
-        } else
-                printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\".  If it helps, post a report\n");
+        }
 
 #ifdef CONFIG_X86_IO_APIC
         if (acpi_ioapic)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 7b6e3bb9b28c..75fcc29ecf52 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -77,59 +77,6 @@ int pcibios_scanned;
  */
 DEFINE_SPINLOCK(pci_config_lock);
 
-/*
- * Several buggy motherboards address only 16 devices and mirror
- * them to next 16 IDs. We try to detect this `feature' on all
- * primary buses (those containing host bridges as they are
- * expected to be unique) and remove the ghost devices.
- */
-
-static void __devinit pcibios_fixup_ghosts(struct pci_bus *b)
-{
-        struct list_head *ln, *mn;
-        struct pci_dev *d, *e;
-        int mirror = PCI_DEVFN(16,0);
-        int seen_host_bridge = 0;
-        int i;
-
-        DBG("PCI: Scanning for ghost devices on bus %d\n", b->number);
-        list_for_each(ln, &b->devices) {
-                d = pci_dev_b(ln);
-                if ((d->class >> 8) == PCI_CLASS_BRIDGE_HOST)
-                        seen_host_bridge++;
-                for (mn=ln->next; mn != &b->devices; mn=mn->next) {
-                        e = pci_dev_b(mn);
-                        if (e->devfn != d->devfn + mirror ||
-                            e->vendor != d->vendor ||
-                            e->device != d->device ||
-                            e->class != d->class)
-                                continue;
-                        for(i=0; i<PCI_NUM_RESOURCES; i++)
-                                if (e->resource[i].start != d->resource[i].start ||
-                                    e->resource[i].end != d->resource[i].end ||
-                                    e->resource[i].flags != d->resource[i].flags)
-                                        continue;
-                        break;
-                }
-                if (mn == &b->devices)
-                        return;
-        }
-        if (!seen_host_bridge)
-                return;
-        printk(KERN_WARNING "PCI: Ignoring ghost devices on bus %02x\n", b->number);
-
-        ln = &b->devices;
-        while (ln->next != &b->devices) {
-                d = pci_dev_b(ln->next);
-                if (d->devfn >= mirror) {
-                        list_del(&d->global_list);
-                        list_del(&d->bus_list);
-                        kfree(d);
-                } else
-                        ln = ln->next;
-        }
-}
-
 static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
 {
         struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE];
@@ -152,7 +99,6 @@ void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
         struct pci_dev *dev;
 
-        pcibios_fixup_ghosts(b);
         pci_read_bridge_bases(b);
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
@@ -427,10 +373,6 @@ static int __init pcibios_init(void)
 
         if (pci_bf_sort >= pci_force_bf)
                 pci_sort_breadthfirst();
-#ifdef CONFIG_PCI_BIOS
-        if ((pci_probe & PCI_BIOS_SORT) && !(pci_probe & PCI_NO_SORT))
-                pcibios_sort();
-#endif
         return 0;
 }
 
@@ -455,9 +397,6 @@ char * __devinit  pcibios_setup(char *str)
         } else if (!strcmp(str, "nobios")) {
                 pci_probe &= ~PCI_PROBE_BIOS;
                 return NULL;
-        } else if (!strcmp(str, "nosort")) {
-                pci_probe |= PCI_NO_SORT;
-                return NULL;
         } else if (!strcmp(str, "biosirq")) {
                 pci_probe |= PCI_BIOS_IRQ_SCAN;
                 return NULL;
@@ -527,7 +466,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
         int err;
 
-        if ((err = pcibios_enable_resources(dev, mask)) < 0)
+        if ((err = pci_enable_resources(dev, mask)) < 0)
                 return err;
 
         if (!dev->msi_enabled)
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 2ead72363077..94f6c73a53d0 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -241,44 +241,6 @@ void __init pcibios_resource_survey(void)
  */
 fs_initcall(pcibios_assign_resources);
 
-int pcibios_enable_resources(struct pci_dev *dev, int mask)
-{
-        u16 cmd, old_cmd;
-        int idx;
-        struct resource *r;
-
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        old_cmd = cmd;
-        for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
-                /* Only set up the requested stuff */
-                if (!(mask & (1 << idx)))
-                        continue;
-
-                r = &dev->resource[idx];
-                if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
-                        continue;
-                if ((idx == PCI_ROM_RESOURCE) &&
-                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
-                        continue;
-                if (!r->start && r->end) {
-                        printk(KERN_ERR "PCI: Device %s not available "
-                                "because of resource %d collisions\n",
-                                pci_name(dev), idx);
-                        return -EINVAL;
-                }
-                if (r->flags & IORESOURCE_IO)
-                        cmd |= PCI_COMMAND_IO;
-                if (r->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        if (cmd != old_cmd) {
-                printk("PCI: Enabling device %s (%04x -> %04x)\n",
-                        pci_name(dev), old_cmd, cmd);
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
-        }
-        return 0;
-}
-
 /*
  *  If we set up a device for bus mastering, we need to check the latency
  *  timer as certain crappy BIOSes forget to set it properly.
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 2f7109ac4c15..37472fc6f729 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -152,28 +152,6 @@ static int __devinit check_pcibios(void)
         return 0;
 }
 
-static int __devinit pci_bios_find_device (unsigned short vendor, unsigned short device_id,
-                                        unsigned short index, unsigned char *bus, unsigned char *device_fn)
-{
-        unsigned short bx;
-        unsigned short ret;
-
-        __asm__("lcall *(%%edi); cld\n\t"
-                "jc 1f\n\t"
-                "xor %%ah, %%ah\n"
-                "1:"
-                : "=b" (bx),
-                  "=a" (ret)
-                : "1" (PCIBIOS_FIND_PCI_DEVICE),
-                  "c" (device_id),
-                  "d" (vendor),
-                  "S" ((int) index),
-                  "D" (&pci_indirect));
-        *bus = (bx >> 8) & 0xff;
-        *device_fn = bx & 0xff;
-        return (int) (ret & 0xff00) >> 8;
-}
-
 static int pci_bios_read(unsigned int seg, unsigned int bus,
                          unsigned int devfn, int reg, int len, u32 *value)
 {
@@ -364,55 +342,6 @@ static struct pci_raw_ops * __devinit pci_find_bios(void)
 }
 
 /*
- * Sort the device list according to PCI BIOS. Nasty hack, but since some
- * fool forgot to define the `correct' device order in the PCI BIOS specs
- * and we want to be (possibly bug-to-bug ;-]) compatible with older kernels
- * which used BIOS ordering, we are bound to do this...
- */
-
-void __devinit pcibios_sort(void)
-{
-        LIST_HEAD(sorted_devices);
-        struct list_head *ln;
-        struct pci_dev *dev, *d;
-        int idx, found;
-        unsigned char bus, devfn;
-
-        DBG("PCI: Sorting device list...\n");
-        while (!list_empty(&pci_devices)) {
-                ln = pci_devices.next;
-                dev = pci_dev_g(ln);
-                idx = found = 0;
-                while (pci_bios_find_device(dev->vendor, dev->device, idx, &bus, &devfn) == PCIBIOS_SUCCESSFUL) {
-                        idx++;
-                        list_for_each(ln, &pci_devices) {
-                                d = pci_dev_g(ln);
-                                if (d->bus->number == bus && d->devfn == devfn) {
-                                        list_move_tail(&d->global_list, &sorted_devices);
-                                        if (d == dev)
-                                                found = 1;
-                                        break;
-                                }
-                        }
-                        if (ln == &pci_devices) {
-                                printk(KERN_WARNING "PCI: BIOS reporting unknown device %02x:%02x\n", bus, devfn);
-                                /*
-                                 * We must not continue scanning as several buggy BIOSes
-                                 * return garbage after the last device. Grr.
-                                 */
-                                break;
-                        }
-                }
-                if (!found) {
-                        printk(KERN_WARNING "PCI: Device %s not found by BIOS\n",
-                                pci_name(dev));
-                        list_move_tail(&dev->global_list, &sorted_devices);
-                }
-        }
-        list_splice(&sorted_devices, &pci_devices);
-}
-
-/*
  *  BIOS Functions for IRQ Routing
  */
 
@@ -495,7 +424,6 @@ void __init pci_pcbios_init(void)
 {
         if ((pci_probe & PCI_PROBE_BIOS) 
                 && ((raw_pci_ops = pci_find_bios()))) {
-                pci_probe |= PCI_BIOS_SORT;
                 pci_bios_present = 1;
         }
 }
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index 3431518d921a..c4bddaeff619 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -19,8 +19,6 @@
 #define PCI_PROBE_MASK          0x000f
 #define PCI_PROBE_NOEARLY       0x0010
 
-#define PCI_NO_SORT             0x0100
-#define PCI_BIOS_SORT           0x0200
 #define PCI_NO_CHECKS           0x0400
 #define PCI_USE_PIRQ_MASK       0x0800
 #define PCI_ASSIGN_ROMS         0x1000
@@ -44,7 +42,6 @@ enum pci_bf_sort_state {
 extern unsigned int pcibios_max_latency;
 
 void pcibios_resource_survey(void);
-int pcibios_enable_resources(struct pci_dev *, int);
 
 /* pci-pc.c */
 
@@ -101,7 +98,6 @@ extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
 extern void pci_mmcfg_init(int type);
-extern void pcibios_sort(void);
 
 /* pci-mmconfig.c */