183 files changed, 881 insertions, 1226 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7d252dbe7d17..5f96cb33743e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -117,13 +117,6 @@ Who:   Adrian Bunk <bunk@stusta.de>
 ---------------------------
-What:   pci_module_init(driver)
-When:   January 2007
-Why:    Is replaced by pci_register_driver(pci_driver).
-Who:    Richard Knutsson <ricknu-0@student.ltu.se> and Greg Kroah-Hartman <gregkh@suse.de>
---------------------------
 What:   Usage of invalid timevals in setitimer
 When:   March 2007
 Why:    POSIX requires to validate timevals in the setitimer call. This
diff --git a/Documentation/pci.txt b/Documentation/pci.txt
index cdf2f3c0ab14..e2c9d0a0c43d 100644
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
@@ -124,10 +124,6 @@ initialization with a pointer to a structure describing the driver
        err_handler     See Documentation/pci-error-recovery.txt
-        multithread_probe       Enable multi-threaded probe/scan. Driver must
-                        provide its own locking/syncronization for init
-                        operations if this is enabled.
 The ID table is an array of struct pci_device_id entries ending with an
 all-zero entry.  Each entry consists of:
@@ -163,9 +159,9 @@ echo "vendor device subvendor subdevice class class_mask driver_data" > \
 /sys/bus/pci/drivers/{driver}/new_id
 All fields are passed in as hexadecimal values (no leading 0x).
-Users need pass only as many fields as necessary:
+The vendor and device fields are mandatory, the others are optional. Users
-        o vendor, device, subvendor, and subdevice fields default
+need pass only as many optional fields as necessary:
-          to PCI_ANY_ID (FFFFFFFF),
+        o subvendor and subdevice fields default to PCI_ANY_ID (FFFFFFFF)
        o class and classmask fields default to 0
        o driver_data defaults to 0UL.
@@ -549,8 +545,6 @@ pci_find_slot()			Find pci_dev corresponding to given bus and
 pci_set_power_state()           Set PCI Power Management state (0=D0 ... 3=D3)
 pci_find_capability()           Find specified capability in device's capability
                                list.
-pci_module_init()               Inline helper function for ensuring correct
-                                pci_driver initialization and error handling.
 pci_resource_start()            Returns bus start address for a given PCI region
 pci_resource_end()              Returns bus end address for a given PCI region
 pci_resource_len()              Returns the byte length of a PCI region
diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt
index b6a3cbf7e846..e00b099a4b86 100644
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
@@ -203,7 +203,7 @@ resume
 Usage:
-if (dev->driver && dev->driver->suspend)
+if (dev->driver && dev->driver->resume)
        dev->driver->resume(dev)
 The resume callback may be called from any power state, and is always meant to
diff --git a/arch/alpha/kernel/err_common.c b/arch/alpha/kernel/err_common.c
index 687580b16b41..13d53b1c9657 100644
--- a/arch/alpha/kernel/err_common.c
+++ b/arch/alpha/kernel/err_common.c
@@ -7,7 +7,6 @@
 */
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <asm/io.h>
diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c
index 69b5f4ea7355..11aee012a8ae 100644
--- a/arch/alpha/kernel/err_ev6.c
+++ b/arch/alpha/kernel/err_ev6.c
@@ -7,7 +7,6 @@
 */
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <asm/io.h>
diff --git a/arch/alpha/kernel/err_ev7.c b/arch/alpha/kernel/err_ev7.c
index 95463ab1cf35..bc799f72d8c1 100644
--- a/arch/alpha/kernel/err_ev7.c
+++ b/arch/alpha/kernel/err_ev7.c
@@ -7,7 +7,6 @@
 */
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <asm/io.h>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e7baca29f3fb..db00376aca15 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -255,6 +255,7 @@ config ARCH_IOP13XX
        depends on MMU
        select PLAT_IOP
        select PCI
+        select ARCH_SUPPORTS_MSI
        help
          Support for Intel's IOP13XX (XScale) family of processors.
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 53d62373a524..bcf2fc408a1a 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1073,6 +1073,7 @@ config PCI
        bool "PCI support" if !X86_VISWS
        depends on !X86_VOYAGER
        default y if X86_VISWS
+        select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
index d59277c00911..b1acc8ce3167 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -13,7 +13,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <asm/msr.h>
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
index ff0d89806114..e1c509aa3054 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
@@ -17,10 +17,10 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <asm/ist.h>
+#include <asm/io.h>
 #include "speedstep-lib.h"
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index b3ab8ffebd27..89d85d244926 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -2611,19 +2611,19 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
        if (irq < 0)
                return irq;
-        set_irq_msi(irq, desc);
        ret = msi_compose_msg(dev, irq, &msg);
        if (ret < 0) {
                destroy_irq(irq);
                return ret;
        }
+        set_irq_msi(irq, desc);
        write_msi_msg(irq, &msg);
        set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq,
                                      "edge");
-        return irq;
+        return 0;
 }
 void arch_teardown_msi_irq(unsigned int irq)
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 8053b17ab647..b62eafb997bc 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -354,7 +354,7 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev)
                printk(KERN_DEBUG "Boot video device is %s\n", pci_name(pdev));
        }
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
 /*
 * Some Toshiba laptops need extra code to enable their TI TSB43AB22/A.
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 43005f044424..bcd2f94b732c 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -246,8 +246,8 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
                        continue;
                if (!r->start && r->end) {
                        printk(KERN_ERR "PCI: Device %s not available "
-                                "because of resource collisions\n",
+                                "because of resource %d collisions\n",
-                                pci_name(dev));
+                                pci_name(dev), idx);
                        return -EINVAL;
                }
                if (r->flags & IORESOURCE_IO)
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e19185d26554..3b71f97d0b60 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -14,6 +14,7 @@ config IA64
        select PCI if (!IA64_HP_SIM)
        select ACPI if (!IA64_HP_SIM)
        select PM if (!IA64_HP_SIM)
+        select ARCH_SUPPORTS_MSI
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index fcf7f93c4b61..2c3f9dfca78b 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <asm/delay.h>
 #include <asm/sn/sn_sal.h>
 #include "ioerror.h"
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 49873aa4a37d..83f190ffe350 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -87,7 +87,6 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
        if (irq < 0)
                return irq;
-        set_irq_msi(irq, entry);
        /*
         * Set up the vector plumbing.  Let the prom (via sn_intr_alloc)
         * decide which cpu to direct this msi at by default.
@@ -144,10 +143,11 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
         */
        msg.data = 0x100 + irq;
+        set_irq_msi(irq, entry);
        write_msi_msg(irq, &msg);
        set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
-        return irq;
+        return 0;
 }
 #ifdef CONFIG_SMP
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index 5419acb89a8c..88fad85ceeff 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
diff --git a/arch/m68knommu/kernel/dma.c b/arch/m68knommu/kernel/dma.c
index 14b19c4161f4..0a25874a2aae 100644
--- a/arch/m68knommu/kernel/dma.c
+++ b/arch/m68knommu/kernel/dma.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/pci.h>
 #include <asm/io.h>
 void *dma_alloc_coherent(struct device *dev, size_t size,
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index d51d5cb0a4a9..e3acb2dad33a 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -6,7 +6,6 @@
 * (C) Copyright 2007 MIPS Technologies, Inc.
 *     written by Ralf Baechle <ralf@linux-mips.org>
 */
-#include <linux/pci.h>
 #include <linux/module.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 60d7d4baa227..7138092826aa 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -340,7 +340,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
        struct pci_dev *dev;
        const char *type;
-        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = alloc_pci_dev();
        if (!dev)
                return NULL;
        type = of_get_property(node, "device_type", NULL);
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 53aa04101ced..3a393c7f390e 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -31,7 +31,6 @@
 #include <linux/timex.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/random.h>
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 48ce84f5be93..4c0a7d732f69 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -32,7 +32,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index 9db825fe37f0..cab395da25da 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -29,7 +29,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index bfa3f52996d1..e58288e14369 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -30,7 +30,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c
index 939abe3c1f45..5dadca3e0d61 100644
--- a/arch/ppc/syslib/ppc4xx_sgdma.c
+++ b/arch/ppc/syslib/ppc4xx_sgdma.c
@@ -23,7 +23,6 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/arch/sh64/mach-cayman/iomap.c b/arch/sh64/mach-cayman/iomap.c
index 2d06e9a55137..a5c645f02d57 100644
--- a/arch/sh64/mach-cayman/iomap.c
+++ b/arch/sh64/mach-cayman/iomap.c
@@ -9,7 +9,6 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 */
-#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/cayman.h>
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 590a41b864b9..be9e10b94ef8 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -306,6 +306,7 @@ config SUN_IO
 config PCI
        bool "PCI support"
+        select ARCH_SUPPORTS_MSI
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 023af41ad68d..9a549547cb2b 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -1092,10 +1092,10 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
                return -EINVAL;
        err = p->setup_msi_irq(&virt_irq, pdev, desc);
-        if (err < 0)
+        if (err)
                return err;
-        return virt_irq;
+        return 0;
 }
 void arch_teardown_msi_irq(unsigned int virt_irq)
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 94295c219329..1ccf4c9a9a43 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1169,8 +1169,6 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
        if (!devino)
                goto out_err;
-        set_irq_msi(*virt_irq_p, entry);
        msiqid = ((devino - pbm->msiq_first_devino) +
                  pbm->msiq_first);
@@ -1204,6 +1202,8 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p,
                msg.address_lo = pbm->msi32_start;
        }
        msg.data = msi_num;
+        set_irq_msi(*virt_irq_p, entry);
        write_msi_msg(*virt_irq_p, &msg);
        irq_install_pre_handler(*virt_irq_p,
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 56eb14c98475..e9b4f058a49a 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -676,6 +676,7 @@ menu "Bus options (PCI etc.)"
 config PCI
        bool "PCI support"
+        select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index c6a5bc7e8118..b7d2b76b92d4 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1983,18 +1983,18 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
        if (irq < 0)
                return irq;
-        set_irq_msi(irq, desc);
        ret = msi_compose_msg(dev, irq, &msg);
        if (ret < 0) {
                destroy_irq(irq);
                return ret;
        }
+        set_irq_msi(irq, desc);
        write_msi_msg(irq, &msg);
        set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");
-        return irq;
+        return 0;
 }
 void arch_teardown_msi_irq(unsigned int irq)
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c
index 0b4cb93db5a3..cd7e6a020602 100644
--- a/arch/xtensa/kernel/xtensa_ksyms.c
+++ b/arch/xtensa/kernel/xtensa_ksyms.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <asm/irq.h>
 #include <linux/in6.h>
-#include <linux/pci.h>
 #include <linux/ide.h>
 #include <asm/uaccess.h>
diff --git a/arch/xtensa/platform-iss/setup.c b/arch/xtensa/platform-iss/setup.c
index c8a42b60c57a..f60c8cf6dfbe 100644
--- a/arch/xtensa/platform-iss/setup.c
+++ b/arch/xtensa/platform-iss/setup.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/reboot.h>
-#include <linux/pci.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>
 #include <linux/major.h>
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 8d60c4eb54fe..2ebd07f2ef81 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -6,7 +6,6 @@
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/string.h>
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 18dba8e78da7..92428e55b0c2 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -226,12 +226,10 @@ static int device_probe_drivers(void *data)
 *
 *      Walk the list of drivers that the bus has and call
 *      driver_probe_device() for each pair. If a compatible
- *      pair is found, break out and return. If the bus specifies
+ *      pair is found, break out and return.
- *      multithreaded probing, walking the list of drivers is done
- *      on a probing thread.
 *
 *      Returns 1 if the device was bound to a driver;
- *      0 if no matching device was found or multithreaded probing is done;
+ *      0 if no matching device was found;
 *      -ENODEV if the device is not registered.
 *
 *      When called for a USB interface, @dev->parent->sem must be held.
@@ -239,7 +237,6 @@ static int device_probe_drivers(void *data)
 int device_attach(struct device * dev)
 {
        int ret = 0;
-        struct task_struct *probe_task = ERR_PTR(-ENOMEM);
        down(&dev->sem);
        if (dev->driver) {
@@ -251,12 +248,7 @@ int device_attach(struct device * dev)
                        ret = 0;
                }
        } else {
-                if (dev->bus->multithread_probe)
+                ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
-                        probe_task = kthread_run(device_probe_drivers, dev,
-                                                 "probe-%s", dev->bus_id);
-                if(IS_ERR(probe_task))
-                        ret = bus_for_each_drv(dev->bus, NULL, dev,
-                                               __device_attach);
        }
        up(&dev->sem);
        return ret;
@@ -383,33 +375,6 @@ void driver_detach(struct device_driver * drv)
        }
 }
-#ifdef CONFIG_PCI_MULTITHREAD_PROBE
-static int __init wait_for_probes(void)
-{
-        DEFINE_WAIT(wait);
-        printk(KERN_INFO "%s: waiting for %d threads\n", __FUNCTION__,
-                        atomic_read(&probe_count));
-        if (!atomic_read(&probe_count))
-                return 0;
-        while (atomic_read(&probe_count)) {
-                prepare_to_wait(&probe_waitqueue, &wait, TASK_UNINTERRUPTIBLE);
-                if (atomic_read(&probe_count))
-                        schedule();
-        }
-        finish_wait(&probe_waitqueue, &wait);
-        return 0;
-}
-core_initcall_sync(wait_for_probes);
-postcore_initcall_sync(wait_for_probes);
-arch_initcall_sync(wait_for_probes);
-subsys_initcall_sync(wait_for_probes);
-fs_initcall_sync(wait_for_probes);
-device_initcall_sync(wait_for_probes);
-late_initcall_sync(wait_for_probes);
-#endif
 EXPORT_SYMBOL_GPL(device_bind_driver);
 EXPORT_SYMBOL_GPL(device_release_driver);
 EXPORT_SYMBOL_GPL(device_attach);
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index b0acf41c0db9..aa8f3a39a704 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -173,7 +173,7 @@ alpha_core_agp_setup(void)
        /*
         * Build a fake pci_dev struct
         */
-        pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        pdev = alloc_pci_dev();
        if (!pdev)
                return -ENOMEM;
        pdev->vendor = 0xffff;
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 3d83b461ccad..f4562cc22343 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -329,7 +329,7 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
        struct agp_bridge_data *bridge;
        int error = 0;
-        fake_bridge_dev = kmalloc(sizeof (struct pci_dev), GFP_KERNEL);
+        fake_bridge_dev = alloc_pci_dev();
        if (!fake_bridge_dev) {
                error = -ENOMEM;
                goto fail;
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c
index 9ebf84d18655..ec435cb25c4f 100644
--- a/drivers/char/hw_random/via-rng.c
+++ b/drivers/char/hw_random/via-rng.c
@@ -26,7 +26,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/hw_random.h>
 #include <asm/io.h>
 #include <asm/msr.h>
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 157b1d09ab55..13808f6083a0 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -42,7 +42,6 @@
 #include <linux/timer.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index bb9a43c6cf3d..9f273f032b0f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -19,7 +19,6 @@
 * 
 */
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 1e4a8d751a71..2f7ba7a514fe 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -38,7 +38,6 @@
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/fs.h>
-#include <linux/pci.h>
 #include <asm/semaphore.h>
 #include <asm/io.h>
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index fc0e0347f9d2..d4fd0fa2f176 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -25,7 +25,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/fs.h>
-#include <linux/pci.h>
+#include <linux/ioport.h>
 #include <linux/scx200.h>
 #include <asm/uaccess.h>
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 67f91bdda089..f35156c58922 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -17,7 +17,6 @@
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index ee65aa1be13a..c6b6898592b1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 5f94e617fe0c..5161aaf9341b 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/wait.h>
 #include <linux/isa.h>
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 6164a9a83396..bd0755c789c5 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -15,7 +15,6 @@
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 842cd0b53e91..eff591deeb46 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -40,7 +40,6 @@
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/random.h>
 #include <linux/rbtree.h>
 #include <linux/spinlock.h>
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 891d1fa7b2eb..223b1aa7d92b 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -39,7 +39,6 @@
 #include <linux/err.h>
 #include <linux/idr.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/rbtree.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index de89717f49fe..9be5cc00a3a9 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -39,7 +39,6 @@
 #include <linux/completion.h>
 #include <linux/err.h>
-#include <linux/pci.h>
 #include <linux/workqueue.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index 4a579b3a1c90..1e13ab42b70b 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -34,7 +34,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/random.h>
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 9a7eaadb1688..6469406ea9d8 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -40,7 +40,6 @@
 #include <linux/random.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/kref.h>
 #include <linux/idr.h>
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 8199b83052a9..d97ded25c4ff 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -40,7 +40,6 @@
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/poll.h>
 #include <linux/rwsem.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index ed55979bfd34..036ed1ef1796 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -38,7 +38,6 @@
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/namei.h>
-#include <linux/pci.h>
 #include "ipath_kernel.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_layer.c b/drivers/infiniband/hw/ipath/ipath_layer.c
index e46aa4ed2a7e..05a1d2b01d9d 100644
--- a/drivers/infiniband/hw/ipath/ipath_layer.c
+++ b/drivers/infiniband/hw/ipath/ipath_layer.c
@@ -37,7 +37,6 @@
 */
 #include <linux/io.h>
-#include <linux/pci.h>
 #include <asm/byteorder.h>
 #include "ipath_kernel.h"
diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/infiniband/hw/ipath/ipath_stats.c
index 9307f7187ca5..d8b5e4cefe25 100644
--- a/drivers/infiniband/hw/ipath/ipath_stats.c
+++ b/drivers/infiniband/hw/ipath/ipath_stats.c
@@ -31,8 +31,6 @@
 * SOFTWARE.
 */
-#include <linux/pci.h>
 #include "ipath_kernel.h"
 struct infinipath_stats ipath_stats;
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index ffa6318ad0cc..4dc398d5e011 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -32,7 +32,6 @@
 */
 #include <linux/ctype.h>
-#include <linux/pci.h>
 #include "ipath_kernel.h"
 #include "ipath_common.h"
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h
index 594144145f45..a1ab06847b75 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
@@ -38,7 +38,6 @@
 #define MTHCA_MEMFREE_H
 #include <linux/list.h>
-#include <linux/pci.h>
 #include <linux/mutex.h>
 #define MTHCA_ICM_CHUNK_LEN \
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index fd558267d1cb..d8f6bb4f53fc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -41,7 +41,6 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
-#include <linux/pci.h>
 #include <linux/kref.h>
 #include <linux/if_infiniband.h>
 #include <linux/mutex.h>
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 38f648f9b0ed..02c6fbaeccf8 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -19,7 +19,6 @@
 #include "isac.h"
 #include "hscx.h"
 #include "isdnl1.h"
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/ppp_defs.h>
 #include <asm/io.h>
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index f7e83a86f444..4c7dedac0e51 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
-#include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include "hysdn_defs.h"
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index a6cbbdd262d6..34d7abc900d7 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -26,11 +26,11 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
-#include <linux/pci.h>
 #include <linux/input.h>
 #include <linux/dvb/frontend.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
+#include <asm/io.h>
 #include "dmxdev.h"
 #include "dvb_demux.h"
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 2aa9ce920607..823cd6cc471e 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index a3246a283aa4..05c7820fe53e 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -33,7 +33,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 68673863d5c9..59a43603b5cb 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 42e2299dcb22..853b1a3d6a1d 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 772fd52d551a..2e4cf1efdd21 100644
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 97ef421dd093..e627062fde3a 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/poll.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <linux/ioport.h>
 #include <linux/types.h>
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ed882ebc7b95..418ea8b7f85a 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -23,7 +23,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/usb.h>
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 44dc7479119c..74839f98b7c4 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -36,7 +36,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ce3321ab995..87c3144ec7fc 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -39,7 +39,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 269d7114a93a..80bf91187856 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -30,7 +30,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index e0fdb1ab7580..339592e7722d 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -33,7 +33,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index ca86f113f36a..276ba3c5143f 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/platform_device.h>
 #include <asm/uaccess.h>
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 6a51e99a8079..60c8b26f0678 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/hdpu_features.h>
-#include <linux/pci.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 8a0c4dec6351..c73e96bfafc6 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -13,7 +13,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 6f368aec5d5d..6413efc045e0 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -13,7 +13,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 88ba82df0fbb..2b30b587c6e8 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/devices/docecc.c b/drivers/mtd/devices/docecc.c
index 52b5d638077f..fd8a8daba3a8 100644
--- a/drivers/mtd/devices/docecc.c
+++ b/drivers/mtd/devices/docecc.c
@@ -29,7 +29,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index acf3ba223298..ecac0e438f49 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -31,7 +31,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 8296305c8297..89deff007116 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e6ef7d7f9f14..0c9ce19ea27a 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/net/atl1/atl1_param.c b/drivers/net/atl1/atl1_param.c
index c407214339f6..bcd0bd891722 100644
--- a/drivers/net/atl1/atl1_param.c
+++ b/drivers/net/atl1/atl1_param.c
@@ -22,7 +22,6 @@
 */
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/moduleparam.h>
 #include "atl1.h"
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index d10fb80e9a63..c39ab803c5d8 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -45,7 +45,6 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index e824d5d231af..88efe9731bab 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index e79700abf7b6..b3fa0d6a159c 100644
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -19,7 +19,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index e2ddd617493a..a4a2a0ea43d3 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -24,7 +24,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 8545e84fc9a0..5603121132cd 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index cdcfb96f360f..04b4f80a1cde 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 65925b5a224f..d0f28981b55a 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index f91447837fd4..d3840108ffbd 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 235b177fb9ac..0a563a83016f 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 3d82d46f4998..50035ebd4f52 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -27,7 +27,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index 8434d752fd81..9e04a6b3ae0d 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -34,7 +34,6 @@
 #define _IXGB_OSDEP_H_
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 0edcd125fd61..6b49fc4bd1a1 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -81,7 +81,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index ed274d6909d0..f8f4d74f01f1 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -23,7 +23,6 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
 #include <linux/mca.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 9bbea5c8acf4..58d7e5d452fa 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -41,7 +41,6 @@
 #include <linux/time.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/mca-legacy.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 942b839ccc5b..6c400ccd38b4 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -14,7 +14,6 @@
 */
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include "tulip.h"
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index 85a521e0d052..be82a2effee3 100644
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -15,7 +15,6 @@
 */
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/jiffies.h>
 #include "tulip.h"
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index c31be0e377a8..4e4a879c3fa5 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -76,7 +76,6 @@
-#include <linux/pci.h>
 #include "tulip.h"
 #include <linux/delay.h>
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index df326fe1cc8f..d2c1f42109b0 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -14,7 +14,6 @@
 */
-#include <linux/pci.h>
 #include "tulip.h"
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index c840d2e67b23..16f26a8364f0 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -22,6 +22,7 @@
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index ae01555d24cf..574737b55f39 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -8,7 +8,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 74876c0073e8..31e1799571ad 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -27,7 +27,6 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 07dbdfbfc15d..e24a7b095dd6 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -38,7 +38,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/init.h>
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 9bb4db552f3c..a68b3b3761a2 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -22,8 +22,6 @@
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
-#include <linux/pci.h>
 struct hppb_card {
        unsigned long hpa;
        struct resource mmio_region;
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 5ea5bc70cb82..7a1d6d512837 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,10 +1,14 @@
 #
 # PCI configuration
 #
+config ARCH_SUPPORTS_MSI
+        bool
+        default n
 config PCI_MSI
        bool "Message Signaled Interrupts (MSI and MSI-X)"
        depends on PCI
-        depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 || SPARC64
+        depends on ARCH_SUPPORTS_MSI
        help
           This allows device drivers to enable MSI (Message Signaled
           Interrupts).  Message Signaled Interrupts enable a device to
@@ -17,31 +21,6 @@ config PCI_MSI
           If you don't know what to do here, say N.
-config PCI_MULTITHREAD_PROBE
-        bool "PCI Multi-threaded probe (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL && BROKEN
-        help
-          Say Y here if you want the PCI core to spawn a new thread for
-          every PCI device that is probed.  This can cause a huge
-          speedup in boot times on multiprocessor machines, and even a
-          smaller speedup on single processor machines.
-          But it can also cause lots of bad things to happen.  A number
-          of PCI drivers cannot properly handle running in this way,
-          some will just not work properly at all, while others might
-          decide to blow up power supplies with a huge load all at once,
-          so use this option at your own risk.
-          It is very unwise to use this option if you are not using a
-          boot process that can handle devices being created in any
-          order.  A program that can create persistent block and network
-          device names (like udev) is a good idea if you wish to use
-          this option.
-          Again, use this option at your own risk, you have been warned!
-          When in doubt, say N.
 config PCI_DEBUG
        bool "PCI Debugging"
        depends on PCI && DEBUG_KERNEL
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index aadaa3c8096b..9e5ea074ad20 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -77,7 +77,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
 * This adds a single pci device to the global
 * device list and adds sysfs and procfs entries
 */
-int __devinit pci_bus_add_device(struct pci_dev *dev)
+int pci_bus_add_device(struct pci_dev *dev)
 {
        int retval;
        retval = device_add(&dev->dev);
@@ -105,7 +105,7 @@ int __devinit pci_bus_add_device(struct pci_dev *dev)
 *
 * Call hotplug for each new devices.
 */
-void __devinit pci_bus_add_devices(struct pci_bus *bus)
+void pci_bus_add_devices(struct pci_bus *bus)
 {
        struct pci_dev *dev;
        int retval;
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index be92695a7833..63d62752fb91 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -2,9 +2,7 @@
 # PCI Hotplug support
 #
-menu "PCI Hotplug Support"
+menuconfig HOTPLUG_PCI
-config HOTPLUG_PCI
        tristate "Support for PCI Hotplug (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL && HOTPLUG
        ---help---
@@ -17,9 +15,10 @@ config HOTPLUG_PCI
          When in doubt, say N.
+if HOTPLUG_PCI
 config HOTPLUG_PCI_FAKE
        tristate "Fake PCI Hotplug driver"
-        depends on HOTPLUG_PCI
        help
          Say Y here if you want to use the fake PCI hotplug driver. It can
          be used to simulate PCI hotplug events if even if your system is
@@ -42,7 +41,7 @@ config HOTPLUG_PCI_FAKE
 config HOTPLUG_PCI_COMPAQ
        tristate "Compaq PCI Hotplug driver"
-        depends on HOTPLUG_PCI && X86 && PCI_BIOS
+        depends on X86 && PCI_BIOS
        help
          Say Y here if you have a motherboard with a Compaq PCI Hotplug
          controller.
@@ -64,7 +63,7 @@ config HOTPLUG_PCI_COMPAQ_NVRAM
 config HOTPLUG_PCI_IBM
        tristate "IBM PCI Hotplug driver"
-        depends on HOTPLUG_PCI && X86_IO_APIC && X86 && PCI_BIOS
+        depends on X86_IO_APIC && X86 && PCI_BIOS
        help
          Say Y here if you have a motherboard with a IBM PCI Hotplug
          controller.
@@ -76,7 +75,6 @@ config HOTPLUG_PCI_IBM
 config HOTPLUG_PCI_ACPI
        tristate "ACPI PCI Hotplug driver"
-        depends on HOTPLUG_PCI
        depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK)
        help
          Say Y here if you have a system that supports PCI Hotplug using
@@ -101,7 +99,6 @@ config HOTPLUG_PCI_ACPI_IBM
 config HOTPLUG_PCI_CPCI
        bool "CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI
        help
          Say Y here if you have a CompactPCI system card with CompactPCI
          hotswap support per the PICMG 2.1 specification.
@@ -110,7 +107,7 @@ config HOTPLUG_PCI_CPCI
 config HOTPLUG_PCI_CPCI_ZT5550
        tristate "Ziatech ZT5550 CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+        depends on HOTPLUG_PCI_CPCI && X86
        help
          Say Y here if you have an Performance Technologies (formerly Intel,
          formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.
@@ -122,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
 config HOTPLUG_PCI_CPCI_GENERIC
        tristate "Generic port I/O CompactPCI Hotplug driver"
-        depends on HOTPLUG_PCI && HOTPLUG_PCI_CPCI && X86
+        depends on HOTPLUG_PCI_CPCI && X86
        help
          Say Y here if you have a CompactPCI system card that exposes the #ENUM
          hotswap signal as a bit in a system register that can be read through
@@ -135,7 +132,6 @@ config HOTPLUG_PCI_CPCI_GENERIC
 config HOTPLUG_PCI_SHPC
        tristate "SHPC PCI Hotplug driver"
-        depends on HOTPLUG_PCI
        help
          Say Y here if you have a motherboard with a SHPC PCI Hotplug
          controller.
@@ -147,7 +143,7 @@ config HOTPLUG_PCI_SHPC
 config HOTPLUG_PCI_RPA
        tristate "RPA PCI Hotplug driver"
-        depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
+        depends on PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
        help
          Say Y here if you have a RPA system that supports PCI Hotplug.
@@ -170,12 +166,11 @@ config HOTPLUG_PCI_RPA_DLPAR
 config HOTPLUG_PCI_SGI
        tristate "SGI PCI Hotplug Support"
-        depends on HOTPLUG_PCI && (IA64_SGI_SN2 || IA64_GENERIC)
+        depends on IA64_SGI_SN2 || IA64_GENERIC
        help
          Say Y here if you want to use the SGI Altix Hotplug
          Driver for PCI devices.
          When in doubt, say N.
-endmenu
+endif # HOTPLUG_PCI
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 1c12e9171097..41f6a8d79c81 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -296,13 +296,17 @@ static struct pci_driver zt5550_hc_driver = {
 static int __init zt5550_init(void)
 {
        struct resource* r;
+        int rc;
        info(DRIVER_DESC " version: " DRIVER_VERSION);
        r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register");
        if(!r)
                return -EBUSY;
-        return pci_register_driver(&zt5550_hc_driver);
+        rc = pci_register_driver(&zt5550_hc_driver);
+        if(rc < 0)
+                release_region(ENUM_PORT, 1);
+        return rc;
 }
 static void __exit
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index e27907c91d92..027f6865d7e3 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -238,7 +238,7 @@ static void pci_rescan_bus(const struct pci_bus *bus)
 {
        unsigned int devfn;
        struct pci_dev *dev;
-        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = alloc_pci_dev();
        if (!dev)
                return;
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index d19fcae8a7c0..ccc57627201e 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -43,6 +43,7 @@ extern int pciehp_poll_mode;
 extern int pciehp_poll_time;
 extern int pciehp_debug;
 extern int pciehp_force;
+extern struct workqueue_struct *pciehp_wq;
 #define dbg(format, arg...)                                             \
        do {                                                            \
@@ -70,14 +71,16 @@ struct slot {
        struct list_head        slot_list;
        char name[SLOT_NAME_SIZE];
        unsigned long last_emi_toggle;
+        struct delayed_work work;       /* work for button event */
+        struct mutex lock;
 };
 struct event_info {
        u32 event_type;
-        u8 hp_slot;
+        struct slot *p_slot;
+        struct work_struct work;
 };
-#define MAX_EVENTS              10
 struct controller {
        struct controller *next;
        struct mutex crit_sect;         /* critical section mutex */
@@ -86,11 +89,9 @@ struct controller {
        int slot_num_inc;               /* 1 or -1 */
        struct pci_dev *pci_dev;
        struct list_head slot_list;
-        struct event_info event_queue[MAX_EVENTS];
        struct slot *slot;
        struct hpc_ops *hpc_ops;
        wait_queue_head_t queue;        /* sleep & wake process */
-        u8 next_event;
        u8 bus;
        u8 device;
        u8 function;
@@ -149,21 +150,17 @@ struct controller {
 #define HP_SUPR_RM(cap)         (cap & HP_SUPR_RM_SUP)
 #define EMI(cap)                (cap & EMI_PRSN)
-extern int pciehp_event_start_thread(void);
+extern int pciehp_sysfs_enable_slot(struct slot *slot);
-extern void pciehp_event_stop_thread(void);
+extern int pciehp_sysfs_disable_slot(struct slot *slot);
-extern int pciehp_enable_slot(struct slot *slot);
-extern int pciehp_disable_slot(struct slot *slot);
 extern u8 pciehp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
 extern u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
 extern int pciehp_configure_device(struct slot *p_slot);
 extern int pciehp_unconfigure_device(struct slot *p_slot);
+extern void pciehp_queue_pushbutton_work(struct work_struct *work);
 int pcie_init(struct controller *ctrl, struct pcie_device *dev);
-/* Global variables */
-extern struct controller *pciehp_ctrl_list;
 static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 {
        struct slot *slot;
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index a92eda6e02f6..e5d3f0b4f45a 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -41,7 +41,7 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-struct controller *pciehp_ctrl_list;
+struct workqueue_struct *pciehp_wq;
 #define DRIVER_VERSION  "0.4"
 #define DRIVER_AUTHOR   "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -62,7 +62,6 @@ MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing"
 #define PCIE_MODULE_NAME "pciehp"
-static int pcie_start_thread (void);
 static int set_attention_status (struct hotplug_slot *slot, u8 value);
 static int enable_slot          (struct hotplug_slot *slot);
 static int disable_slot         (struct hotplug_slot *slot);
@@ -229,6 +228,8 @@ static int init_slots(struct controller *ctrl)
                slot->device = ctrl->slot_device_offset + i;
                slot->hpc_ops = ctrl->hpc_ops;
                slot->number = ctrl->first_slot;
+                mutex_init(&slot->lock);
+                INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
                /* register this slot with the hotplug pci core */
                hotplug_slot->private = slot;
@@ -286,6 +287,9 @@ static void cleanup_slots(struct controller *ctrl)
                if (EMI(ctrl->ctrlcap))
                        sysfs_remove_file(&slot->hotplug_slot->kobj,
                                &hotplug_slot_attr_lock.attr);
+                cancel_delayed_work(&slot->work);
+                flush_scheduled_work();
+                flush_workqueue(pciehp_wq);
                pci_hp_deregister(slot->hotplug_slot);
        }
 }
@@ -314,7 +318,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-        return pciehp_enable_slot(slot);
+        return pciehp_sysfs_enable_slot(slot);
 }
@@ -324,7 +328,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-        return pciehp_disable_slot(slot);
+        return pciehp_sysfs_disable_slot(slot);
 }
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
@@ -466,17 +470,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
-        /*      Finish setting up the hot plug ctrl device */
-        ctrl->next_event = 0;
-        if (!pciehp_ctrl_list) {
-                pciehp_ctrl_list = ctrl;
-                ctrl->next = NULL;
-        } else {
-                ctrl->next = pciehp_ctrl_list;
-                pciehp_ctrl_list = ctrl;
-        }
        t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
        if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
                rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
@@ -496,48 +489,14 @@ err_out_none:
        return -ENODEV;
 }
+static void pciehp_remove (struct pcie_device *dev)
-static int pcie_start_thread(void)
 {
-        int retval = 0;
+        struct pci_dev *pdev = dev->port;
-        
+        struct controller *ctrl = pci_get_drvdata(pdev);
-        dbg("Initialize + Start the notification/polling mechanism \n");
-        retval = pciehp_event_start_thread();
-        if (retval) {
-                dbg("pciehp_event_start_thread() failed\n");
-                return retval;
-        }
-        return retval;
-}
-static void __exit unload_pciehpd(void)
-{
-        struct controller *ctrl;
-        struct controller *tctrl;
-        ctrl = pciehp_ctrl_list;
-        while (ctrl) {
-                cleanup_slots(ctrl);
-                ctrl->hpc_ops->release_ctlr(ctrl);
+        cleanup_slots(ctrl);
+        ctrl->hpc_ops->release_ctlr(ctrl);
-                tctrl = ctrl;
+        kfree(ctrl);
-                ctrl = ctrl->next;
-                kfree(tctrl);
-        }
-        /* Stop the notification mechanism */
-        pciehp_event_stop_thread();
-}
-static void pciehp_remove (struct pcie_device *device)
-{
-        /* XXX - Needs to be adapted to device driver model */
 }
 #ifdef CONFIG_PM
@@ -585,31 +544,18 @@ static int __init pcied_init(void)
        pciehp_poll_mode = 1;
 #endif
-        retval = pcie_start_thread();
-        if (retval)
-                goto error_hpc_init;
        retval = pcie_port_service_register(&hpdriver_portdrv);
        dbg("pcie_port_service_register = %d\n", retval);
        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
        if (retval)
                dbg("%s: Failure to register service\n", __FUNCTION__);
-error_hpc_init:
-        if (retval) {
-                pciehp_event_stop_thread();
-        };
        return retval;
 }
 static void __exit pcied_cleanup(void)
 {
        dbg("unload_pciehpd()\n");
-        unload_pciehpd();
        pcie_port_service_unregister(&hpdriver_portdrv);
        info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
 }
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 4283ef56dbd9..7f22caa70178 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -32,92 +32,61 @@
 #include <linux/types.h>
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
+#include <linux/workqueue.h>
 #include "../pci.h"
 #include "pciehp.h"
-static void interrupt_event_handler(struct controller *ctrl);
+static void interrupt_event_handler(struct work_struct *work);
+static int pciehp_enable_slot(struct slot *p_slot);
+static int pciehp_disable_slot(struct slot *p_slot);
-static struct semaphore event_semaphore;        /* mutex for process loop (up if something to process) */
+static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
-static struct semaphore event_exit;             /* guard ensure thread has exited before calling it quits */
-static int event_finished;
-static unsigned long pushbutton_pending;        /* = 0 */
-static unsigned long surprise_rm_pending;       /* = 0 */
-static inline char *slot_name(struct slot *p_slot)
 {
-        return p_slot->hotplug_slot->name;
+        struct event_info *info;
+        info = kmalloc(sizeof(*info), GFP_ATOMIC);
+        if (!info)
+                return -ENOMEM;
+        info->event_type = event_type;
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, interrupt_event_handler);
+        schedule_work(&info->work);
+        return 0;
 }
 u8 pciehp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
 {
        struct slot *p_slot;
-        u8 rc = 0;
+        u32 event_type;
-        u8 getstatus;
-        struct event_info *taskInfo;
        /* Attention Button Change */
        dbg("pciehp:  Attention button interrupt received.\n");
-        
-        /* This is the structure that tells the worker thread what to do */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-        
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-        rc++;
+        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
        /*
         *  Button pressed - See if need to TAKE ACTION!!!
         */
-        info("Button pressed on Slot(%s)\n", slot_name(p_slot));
+        info("Button pressed on Slot(%s)\n", p_slot->name);
-        taskInfo->event_type = INT_BUTTON_PRESS;
+        event_type = INT_BUTTON_PRESS;
-        if ((p_slot->state == BLINKINGON_STATE)
-            || (p_slot->state == BLINKINGOFF_STATE)) {
-                /* Cancel if we are still blinking; this means that we press the
-                 * attention again before the 5 sec. limit expires to cancel hot-add
-                 * or hot-remove
-                 */
-                taskInfo->event_type = INT_BUTTON_CANCEL;
-                info("Button cancel on Slot(%s)\n", slot_name(p_slot));
-        } else if ((p_slot->state == POWERON_STATE)
-                   || (p_slot->state == POWEROFF_STATE)) {
-                /* Ignore if the slot is on power-on or power-off state; this 
-                 * means that the previous attention button action to hot-add or
-                 * hot-remove is undergoing
-                 */
-                taskInfo->event_type = INT_BUTTON_IGNORE;
-                info("Button ignore on Slot(%s)\n", slot_name(p_slot));
-        }
-        if (rc)
+        queue_interrupt_event(p_slot, event_type);
-                up(&event_semaphore);   /* signal event thread that new event is posted */
        return 0;
 }
 u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
 {
        struct slot *p_slot;
-        u8 rc = 0;
        u8 getstatus;
-        struct event_info *taskInfo;
+        u32 event_type;
        /* Switch Change */
        dbg("pciehp:  Switch interrupt received.\n");
-        /* This is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-        rc++;
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
@@ -125,39 +94,30 @@ u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
                /*
                 * Switch opened
                 */
-                info("Latch open on Slot(%s)\n", slot_name(p_slot));
+                info("Latch open on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_SWITCH_OPEN;
+                event_type = INT_SWITCH_OPEN;
        } else {
                /*
                 *  Switch closed
                 */
-                info("Latch close on Slot(%s)\n", slot_name(p_slot));
+                info("Latch close on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_SWITCH_CLOSE;
+                event_type = INT_SWITCH_CLOSE;
        }
-        if (rc)
+        queue_interrupt_event(p_slot, event_type);
-                up(&event_semaphore);   /* signal event thread that new event is posted */
-        return rc;
+        return 1;
 }
 u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
 {
        struct slot *p_slot;
-        u8 presence_save, rc = 0;
+        u32 event_type;
-        struct event_info *taskInfo;
+        u8 presence_save;
        /* Presence Change */
        dbg("pciehp:  Presence/Notify input change.\n");
-        /* This is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-        rc++;
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
        /* Switch is open, assume a presence change
@@ -168,59 +128,49 @@ u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
                /*
                 * Card Present
                 */
-                info("Card present on Slot(%s)\n", slot_name(p_slot));
+                info("Card present on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_PRESENCE_ON;
+                event_type = INT_PRESENCE_ON;
        } else {
                /*
                 * Not Present
                 */
-                info("Card not present on Slot(%s)\n", slot_name(p_slot));
+                info("Card not present on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_PRESENCE_OFF;
+                event_type = INT_PRESENCE_OFF;
        }
-        if (rc)
+        queue_interrupt_event(p_slot, event_type);
-                up(&event_semaphore);   /* signal event thread that new event is posted */
-        return rc;
+        return 1;
 }
 u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
 {
        struct slot *p_slot;
-        u8 rc = 0;
+        u32 event_type;
-        struct event_info *taskInfo;
        /* power fault */
        dbg("pciehp:  Power fault interrupt received.\n");
-        /* this is the structure that tells the worker thread
-         * what to do
-         */
-        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
-        ctrl->next_event = (ctrl->next_event + 1) % MAX_EVENTS;
-        taskInfo->hp_slot = hp_slot;
-        rc++;
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
        if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) {
                /*
                 * power fault Cleared
                 */
-                info("Power fault cleared on Slot(%s)\n", slot_name(p_slot));
+                info("Power fault cleared on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_POWER_FAULT_CLEAR;
+                event_type = INT_POWER_FAULT_CLEAR;
        } else {
                /*
                 *   power fault
                 */
-                info("Power fault on Slot(%s)\n", slot_name(p_slot));
+                info("Power fault on Slot(%s)\n", p_slot->name);
-                taskInfo->event_type = INT_POWER_FAULT;
+                event_type = INT_POWER_FAULT;
                info("power fault bit %x set\n", hp_slot);
        }
-        if (rc)
-                up(&event_semaphore);   /* signal event thread that new event is posted */
-        return rc;
+        queue_interrupt_event(p_slot, event_type);
+        return 1;
 }
 /* The following routines constitute the bulk of the 
@@ -357,13 +307,10 @@ static int remove_board(struct slot *p_slot)
        return 0;
 }
+struct power_work_info {
-static void pushbutton_helper_thread(unsigned long data)
+        struct slot *p_slot;
-{
+        struct work_struct work;
-        pushbutton_pending = data;
+};
-        up(&event_semaphore);
-}
 /**
 * pciehp_pushbutton_thread
@@ -372,276 +319,214 @@ static void pushbutton_helper_thread(unsigned long data)
 * Handles all pending events and exits.
 *
 */
-static void pciehp_pushbutton_thread(unsigned long slot)
+static void pciehp_power_thread(struct work_struct *work)
 {
-        struct slot *p_slot = (struct slot *) slot;
+        struct power_work_info *info =
-        u8 getstatus;
+                container_of(work, struct power_work_info, work);
-        
+        struct slot *p_slot = info->p_slot;
-        pushbutton_pending = 0;
+        mutex_lock(&p_slot->lock);
-        if (!p_slot) {
+        switch (p_slot->state) {
-                dbg("%s: Error! slot NULL\n", __FUNCTION__);
+        case POWEROFF_STATE:
-                return;
+                mutex_unlock(&p_slot->lock);
-        }
+                dbg("%s: disabling bus:device(%x:%x)\n",
+                    __FUNCTION__, p_slot->bus, p_slot->device);
-        p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
-        if (getstatus) {
-                p_slot->state = POWEROFF_STATE;
-                dbg("%s: disabling bus:device(%x:%x)\n", __FUNCTION__,
-                                p_slot->bus, p_slot->device);
                pciehp_disable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
                p_slot->state = STATIC_STATE;
-        } else {
+                break;
-                p_slot->state = POWERON_STATE;
+        case POWERON_STATE:
-                dbg("%s: adding bus:device(%x:%x)\n", __FUNCTION__,
+                mutex_unlock(&p_slot->lock);
-                                p_slot->bus, p_slot->device);
                if (pciehp_enable_slot(p_slot) &&
                    PWR_LED(p_slot->ctrl->ctrlcap))
                        p_slot->hpc_ops->green_led_off(p_slot);
+                mutex_lock(&p_slot->lock);
                p_slot->state = STATIC_STATE;
+                break;
+        default:
+                break;
        }
+        mutex_unlock(&p_slot->lock);
-        return;
+        kfree(info);
 }
-/**
+void pciehp_queue_pushbutton_work(struct work_struct *work)
- * pciehp_surprise_rm_thread
- *
- * Scheduled procedure to handle blocking stuff for the surprise removal
- * Handles all pending events and exits.
- *
- */
-static void pciehp_surprise_rm_thread(unsigned long slot)
 {
-        struct slot *p_slot = (struct slot *) slot;
+        struct slot *p_slot = container_of(work, struct slot, work.work);
-        u8 getstatus;
+        struct power_work_info *info;
-        
-        surprise_rm_pending = 0;
-        if (!p_slot) {
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
-                dbg("%s: Error! slot NULL\n", __FUNCTION__);
+        if (!info) {
+                err("%s: Cannot allocate memory\n", __FUNCTION__);
                return;
        }
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, pciehp_power_thread);
-        p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
+        mutex_lock(&p_slot->lock);
-        if (!getstatus) {
+        switch (p_slot->state) {
+        case BLINKINGOFF_STATE:
                p_slot->state = POWEROFF_STATE;
-                dbg("%s: removing bus:device(%x:%x)\n",
+                break;
-                                __FUNCTION__, p_slot->bus, p_slot->device);
+        case BLINKINGON_STATE:
-                pciehp_disable_slot(p_slot);
-                p_slot->state = STATIC_STATE;
-        } else {
                p_slot->state = POWERON_STATE;
-                dbg("%s: adding bus:device(%x:%x)\n",
+                break;
-                                __FUNCTION__, p_slot->bus, p_slot->device);
+        default:
+                goto out;
-                if (pciehp_enable_slot(p_slot) &&
-                    PWR_LED(p_slot->ctrl->ctrlcap))
-                        p_slot->hpc_ops->green_led_off(p_slot);
-                p_slot->state = STATIC_STATE;
        }
+        queue_work(pciehp_wq, &info->work);
-        return;
+ out:
+        mutex_unlock(&p_slot->lock);
 }
-/* this is the main worker thread */
-static int event_thread(void* data)
-{
-        struct controller *ctrl;
-        lock_kernel();
-        daemonize("pciehpd_event");
-        unlock_kernel();
-        while (1) {
-                dbg("!!!!event_thread sleeping\n");
-                down_interruptible (&event_semaphore);
-                dbg("event_thread woken finished = %d\n", event_finished);
-                if (event_finished || signal_pending(current))
-                        break;
-                /* Do stuff here */
-                if (pushbutton_pending)
-                        pciehp_pushbutton_thread(pushbutton_pending);
-                else if (surprise_rm_pending)
-                        pciehp_surprise_rm_thread(surprise_rm_pending);
-                else
-                        for (ctrl = pciehp_ctrl_list; ctrl; ctrl=ctrl->next)
-                                interrupt_event_handler(ctrl);
-        }
-        dbg("event_thread signals exit\n");
-        up(&event_exit);
-        return 0;
-}
-int pciehp_event_start_thread(void)
-{
-        int pid;
-        /* initialize our semaphores */
-        init_MUTEX_LOCKED(&event_exit);
-        event_finished=0;
-        init_MUTEX_LOCKED(&event_semaphore);
-        pid = kernel_thread(event_thread, NULL, 0);
-        if (pid < 0) {
-                err ("Can't start up our event thread\n");
-                return -1;
-        }
-        return 0;
-}
-void pciehp_event_stop_thread(void)
-{
-        event_finished = 1;
-        up(&event_semaphore);
-        down(&event_exit);
-}
 static int update_slot_info(struct slot *slot)
 {
        struct hotplug_slot_info *info;
-        /* char buffer[SLOT_NAME_SIZE]; */
        int result;
-        info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-        /* make_slot_name (&buffer[0], SLOT_NAME_SIZE, slot); */
        slot->hpc_ops->get_power_status(slot, &(info->power_status));
        slot->hpc_ops->get_attention_status(slot, &(info->attention_status));
        slot->hpc_ops->get_latch_status(slot, &(info->latch_status));
        slot->hpc_ops->get_adapter_status(slot, &(info->adapter_status));
-        /* result = pci_hp_change_slot_info(buffer, info); */
        result = pci_hp_change_slot_info(slot->hotplug_slot, info);
        kfree (info);
        return result;
 }
-static void interrupt_event_handler(struct controller *ctrl)
+/*
+ * Note: This function must be called with slot->lock held
+ */
+static void handle_button_press_event(struct slot *p_slot)
 {
-        int loop = 0;
+        struct controller *ctrl = p_slot->ctrl;
-        int change = 1;
-        u8 hp_slot;
        u8 getstatus;
-        struct slot *p_slot;
-        while (change) {
+        switch (p_slot->state) {
-                change = 0;
+        case STATIC_STATE:
+                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
-                for (loop = 0; loop < MAX_EVENTS; loop++) {
+                if (getstatus) {
-                        if (ctrl->event_queue[loop].event_type != 0) {
+                        p_slot->state = BLINKINGOFF_STATE;
-                                hp_slot = ctrl->event_queue[loop].hp_slot;
+                        info("PCI slot #%s - powering off due to button "
+                             "press.\n", p_slot->name);
-                                p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
+                } else {
+                        p_slot->state = BLINKINGON_STATE;
-                                if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) {
+                        info("PCI slot #%s - powering on due to button "
-                                        dbg("button cancel\n");
+                             "press.\n", p_slot->name);
-                                        del_timer(&p_slot->task_event);
+                }
+                /* blink green LED and turn off amber */
-                                        switch (p_slot->state) {
+                if (PWR_LED(ctrl->ctrlcap))
-                                        case BLINKINGOFF_STATE:
+                        p_slot->hpc_ops->green_led_blink(p_slot);
-                                                if (PWR_LED(ctrl->ctrlcap))
+                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_on(p_slot);
+                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                                                if (ATTN_LED(ctrl->ctrlcap))
+                schedule_delayed_work(&p_slot->work, 5*HZ);
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
+                break;
-                                                break;
+        case BLINKINGOFF_STATE:
-                                        case BLINKINGON_STATE:
+        case BLINKINGON_STATE:
-                                                if (PWR_LED(ctrl->ctrlcap))
+                /*
-                                                        p_slot->hpc_ops->green_led_off(p_slot);
+                 * Cancel if we are still blinking; this means that we
+                 * press the attention again before the 5 sec. limit
-                                                if (ATTN_LED(ctrl->ctrlcap))
+                 * expires to cancel hot-add or hot-remove
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
+                 */
-                                                break;
+                info("Button cancel on Slot(%s)\n", p_slot->name);
-                                        default:
+                dbg("%s: button cancel\n", __FUNCTION__);
-                                                warn("Not a valid state\n");
+                cancel_delayed_work(&p_slot->work);
-                                                return;
+                if (p_slot->state == BLINKINGOFF_STATE) {
-                                        }
+                        if (PWR_LED(ctrl->ctrlcap))
-                                        info("PCI slot #%s - action canceled due to button press.\n", slot_name(p_slot));
+                                p_slot->hpc_ops->green_led_on(p_slot);
-                                        p_slot->state = STATIC_STATE;
+                } else {
-                                }
+                        if (PWR_LED(ctrl->ctrlcap))
-                                /* ***********Button Pressed (No action on 1st press...) */
+                                p_slot->hpc_ops->green_led_off(p_slot);
-                                else if (ctrl->event_queue[loop].event_type == INT_BUTTON_PRESS) {
+                }
-                                        
+                if (ATTN_LED(ctrl->ctrlcap))
-                                        if (ATTN_BUTTN(ctrl->ctrlcap)) {
+                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                                                dbg("Button pressed\n");
+                info("PCI slot #%s - action canceled due to button press\n",
-                                                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
+                     p_slot->name);
-                                                if (getstatus) {
+                p_slot->state = STATIC_STATE;
-                                                        /* slot is on */
+                break;
-                                                        dbg("slot is on\n");
+        case POWEROFF_STATE:
-                                                        p_slot->state = BLINKINGOFF_STATE;
+        case POWERON_STATE:
-                                                        info("PCI slot #%s - powering off due to button press.\n", slot_name(p_slot));
+                /*
-                                                } else {
+                 * Ignore if the slot is on power-on or power-off state;
-                                                        /* slot is off */
+                 * this means that the previous attention button action
-                                                        dbg("slot is off\n");
+                 * to hot-add or hot-remove is undergoing
-                                                        p_slot->state = BLINKINGON_STATE;
+                 */
-                                                        info("PCI slot #%s - powering on due to button press.\n", slot_name(p_slot));
+                info("Button ignore on Slot(%s)\n", p_slot->name);
-                                                }
+                update_slot_info(p_slot);
+                break;
-                                                /* blink green LED and turn off amber */
+        default:
-                                                if (PWR_LED(ctrl->ctrlcap))
+                warn("Not a valid state\n");
-                                                        p_slot->hpc_ops->green_led_blink(p_slot);
+                break;
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                                                init_timer(&p_slot->task_event);
-                                                p_slot->task_event.expires = jiffies + 5 * HZ;   /* 5 second delay */
-                                                p_slot->task_event.function = (void (*)(unsigned long)) pushbutton_helper_thread;
-                                                p_slot->task_event.data = (unsigned long) p_slot;
-                                                add_timer(&p_slot->task_event);
-                                        }
-                                }
-                                /***********POWER FAULT********************/
-                                else if (ctrl->event_queue[loop].event_type == INT_POWER_FAULT) {
-                                        if (POWER_CTRL(ctrl->ctrlcap)) {
-                                                dbg("power fault\n");
-                                                if (ATTN_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->set_attention_status(p_slot, 1);
-                                                if (PWR_LED(ctrl->ctrlcap))
-                                                        p_slot->hpc_ops->green_led_off(p_slot);
-                                        }
-                                }
-                                /***********SURPRISE REMOVAL********************/
-                                else if ((ctrl->event_queue[loop].event_type == INT_PRESENCE_ON) || 
-                                        (ctrl->event_queue[loop].event_type == INT_PRESENCE_OFF)) {
-                                        if (HP_SUPR_RM(ctrl->ctrlcap)) {
-                                                dbg("Surprise Removal\n");
-                                                if (p_slot) {
-                                                        surprise_rm_pending = (unsigned long) p_slot;
-                                                        up(&event_semaphore);
-                                                        update_slot_info(p_slot);
-                                                }
-                                        }
-                                } else {
-                                        /* refresh notification */
-                                        if (p_slot)
-                                                update_slot_info(p_slot);
-                                }
-                                ctrl->event_queue[loop].event_type = 0;
-                                change = 1;
-                        }
-                }               /* End of FOR loop */
        }
 }
+/*
+ * Note: This function must be called with slot->lock held
+ */
+static void handle_surprise_event(struct slot *p_slot)
+{
+        u8 getstatus;
+        struct power_work_info *info;
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                err("%s: Cannot allocate memory\n", __FUNCTION__);
+                return;
+        }
+        info->p_slot = p_slot;
+        INIT_WORK(&info->work, pciehp_power_thread);
+        p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
+        if (!getstatus)
+                p_slot->state = POWEROFF_STATE;
+        else
+                p_slot->state = POWERON_STATE;
+        queue_work(pciehp_wq, &info->work);
+}
+static void interrupt_event_handler(struct work_struct *work)
+{
+        struct event_info *info = container_of(work, struct event_info, work);
+        struct slot *p_slot = info->p_slot;
+        struct controller *ctrl = p_slot->ctrl;
+        mutex_lock(&p_slot->lock);
+        switch (info->event_type) {
+        case INT_BUTTON_PRESS:
+                handle_button_press_event(p_slot);
+                break;
+        case INT_POWER_FAULT:
+                if (!POWER_CTRL(ctrl->ctrlcap))
+                        break;
+                if (ATTN_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->set_attention_status(p_slot, 1);
+                if (PWR_LED(ctrl->ctrlcap))
+                        p_slot->hpc_ops->green_led_off(p_slot);
+                break;
+        case INT_PRESENCE_ON:
+        case INT_PRESENCE_OFF:
+                if (!HP_SUPR_RM(ctrl->ctrlcap))
+                        break;
+                dbg("Surprise Removal\n");
+                update_slot_info(p_slot);
+                handle_surprise_event(p_slot);
+                break;
+        default:
+                update_slot_info(p_slot);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+        kfree(info);
+}
 int pciehp_enable_slot(struct slot *p_slot)
 {
        u8 getstatus = 0;
@@ -653,7 +538,7 @@ int pciehp_enable_slot(struct slot *p_slot)
        rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
        if (rc || !getstatus) {
                info("%s: no adapter on slot(%s)\n", __FUNCTION__,
-                     slot_name(p_slot));
+                     p_slot->name);
                mutex_unlock(&p_slot->ctrl->crit_sect);
                return -ENODEV;
        }
@@ -661,7 +546,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                if (rc || getstatus) {
                        info("%s: latch open on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                        mutex_unlock(&p_slot->ctrl->crit_sect);
                        return -ENODEV;
                }
@@ -671,7 +556,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                if (rc || getstatus) {
                        info("%s: already enabled on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                        mutex_unlock(&p_slot->ctrl->crit_sect);
                        return -EINVAL;
                }
@@ -706,7 +591,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
                if (ret || !getstatus) {
                        info("%s: no adapter on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                        mutex_unlock(&p_slot->ctrl->crit_sect);
                        return -ENODEV;
                }
@@ -716,7 +601,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                if (ret || getstatus) {
                        info("%s: latch open on slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                        mutex_unlock(&p_slot->ctrl->crit_sect);
                        return -ENODEV;
                }
@@ -726,7 +611,7 @@ int pciehp_disable_slot(struct slot *p_slot)
                ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                if (ret || !getstatus) {
                        info("%s: already disabled slot(%s)\n", __FUNCTION__,
-                             slot_name(p_slot));
+                             p_slot->name);
                        mutex_unlock(&p_slot->ctrl->crit_sect);
                        return -EINVAL;
                }
@@ -739,3 +624,66 @@ int pciehp_disable_slot(struct slot *p_slot)
        return ret;
 }
+int pciehp_sysfs_enable_slot(struct slot *p_slot)
+{
+        int retval = -ENODEV;
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case BLINKINGON_STATE:
+                cancel_delayed_work(&p_slot->work);
+        case STATIC_STATE:
+                p_slot->state = POWERON_STATE;
+                mutex_unlock(&p_slot->lock);
+                retval = pciehp_enable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
+                p_slot->state = STATIC_STATE;
+                break;
+        case POWERON_STATE:
+                info("Slot %s is already in powering on state\n",
+                     p_slot->name);
+                break;
+        case BLINKINGOFF_STATE:
+        case POWEROFF_STATE:
+                info("Already enabled on slot %s\n", p_slot->name);
+                break;
+        default:
+                err("Not a valid state on slot %s\n", p_slot->name);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+        return retval;
+}
+int pciehp_sysfs_disable_slot(struct slot *p_slot)
+{
+        int retval = -ENODEV;
+        mutex_lock(&p_slot->lock);
+        switch (p_slot->state) {
+        case BLINKINGOFF_STATE:
+                cancel_delayed_work(&p_slot->work);
+        case STATIC_STATE:
+                p_slot->state = POWEROFF_STATE;
+                mutex_unlock(&p_slot->lock);
+                retval = pciehp_disable_slot(p_slot);
+                mutex_lock(&p_slot->lock);
+                p_slot->state = STATIC_STATE;
+                break;
+        case POWEROFF_STATE:
+                info("Slot %s is already in powering off state\n",
+                     p_slot->name);
+                break;
+        case BLINKINGON_STATE:
+        case POWERON_STATE:
+                info("Already disabled on slot %s\n", p_slot->name);
+                break;
+        default:
+                err("Not a valid state on slot %s\n", p_slot->name);
+                break;
+        }
+        mutex_unlock(&p_slot->lock);
+        return retval;
+}
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index fbc64aa2dd68..9aac6a87eb53 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -71,6 +71,8 @@
 #define DBG_LEAVE_ROUTINE
 #endif                          /* DEBUG */
+static atomic_t pciehp_num_controllers = ATOMIC_INIT(0);
 struct ctrl_reg {
        u8 cap_id;
        u8 nxt_ptr;
@@ -219,10 +221,7 @@ static inline int pciehp_writel(struct controller *ctrl, int reg, u32 value)
 #define EMI_STATE               0x0080
 #define EMI_STATUS_BIT          7
-static spinlock_t hpc_event_lock;
 DEFINE_DBG_BUFFER               /* Debug string buffer for entire HPC defined here */
-static int ctlr_seq_num = 0;    /* Controller sequence # */
 static irqreturn_t pcie_isr(int irq, void *dev_id);
 static void start_int_poll_timer(struct controller *ctrl, int sec);
@@ -656,6 +655,13 @@ static void hpc_release_ctlr(struct controller *ctrl)
        else
                free_irq(ctrl->pci_dev->irq, ctrl);
+        /*
+         * If this is the last controller to be released, destroy the
+         * pciehp work queue
+         */
+        if (atomic_dec_and_test(&pciehp_num_controllers))
+                destroy_workqueue(pciehp_wq);
        DBG_LEAVE_ROUTINE
 }
@@ -1152,7 +1158,6 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)
 int pcie_init(struct controller * ctrl, struct pcie_device *dev)
 {
        int rc;
-        static int first = 1;
        u16 temp_word;
        u16 cap_reg;
        u16 intr_enable = 0;
@@ -1221,11 +1226,6 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
        dbg("%s: SLOTCTRL offset %x slot_ctrl %x\n",
            __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_ctrl);
-        if (first) {
-                spin_lock_init(&hpc_event_lock);
-                first = 0;
-        }
        for ( rc = 0; rc < DEVICE_COUNT_RESOURCE; rc++)
                if (pci_resource_len(pdev, rc) > 0)
                        dbg("pci resource[%d] start=0x%llx(len=0x%llx)\n", rc,
@@ -1286,7 +1286,8 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
                rc = request_irq(ctrl->pci_dev->irq, pcie_isr, IRQF_SHARED,
                                 MY_NAME, (void *)ctrl);
                dbg("%s: request_irq %d for hpc%d (returns %d)\n",
-                    __FUNCTION__, ctrl->pci_dev->irq, ctlr_seq_num, rc);
+                    __FUNCTION__, ctrl->pci_dev->irq,
+                    atomic_read(&pciehp_num_controllers), rc);
                if (rc) {
                        err("Can't get irq %d for the hotplug controller\n",
                            ctrl->pci_dev->irq);
@@ -1296,6 +1297,18 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
        dbg("pciehp ctrl b:d:f:irq=0x%x:%x:%x:%x\n", pdev->bus->number,
                PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), dev->irq);
+        /*
+         * If this is the first controller to be initialized,
+         * initialize the pciehp work queue
+         */
+        if (atomic_add_return(1, &pciehp_num_controllers) == 1) {
+                pciehp_wq = create_singlethread_workqueue("pciehpd");
+                if (!pciehp_wq) {
+                        rc = -ENOMEM;
+                        goto abort_free_irq;
+                }
+        }
        rc = pciehp_readw(ctrl, SLOTCTRL, &temp_word);
        if (rc) {
                err("%s: Cannot read SLOTCTRL register\n", __FUNCTION__);
@@ -1349,7 +1362,6 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
                        goto abort_disable_intr;
        }
-        ctlr_seq_num++;
        ctrl->hpc_ops = &pciehp_hpc_ops;
        DBG_LEAVE_ROUTINE
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 72383467a0d5..bb3c101c2c5a 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -98,7 +98,15 @@ static struct device_node *find_dlpar_node(char *drc_name, int *node_type)
        return NULL;
 }
-static struct slot *find_slot(struct device_node *dn)
+/**
+ * find_php_slot - return hotplug slot structure for device node
+ *
+ * This routine will return the hotplug slot structure
+ * for a given device node. Note that built-in PCI slots
+ * may be dlpar-able, but not hot-pluggable, so this routine
+ * will return NULL for built-in PCI slots.
+ */
+static struct slot *find_php_slot(struct device_node *dn)
 {
        struct list_head *tmp, *n;
        struct slot *slot;
@@ -224,9 +232,9 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
        if (!pcibios_find_pci_bus(dn))
                return -EINVAL;
-        slot = find_slot(dn);
+        /* If pci slot is hotplugable, use hotplug to remove it */
+        slot = find_php_slot(dn);
        if (slot) {
-                /* Remove hotplug slot */
                if (rpaphp_deregister_slot(slot)) {
                        printk(KERN_ERR
                                "%s: unable to remove hotplug slot %s\n",
@@ -370,22 +378,17 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
        if (!bus)
                return -EINVAL;
-        slot = find_slot(dn);
+        /* If pci slot is hotplugable, use hotplug to remove it */
+        slot = find_php_slot(dn);
        if (slot) {
-                /* Remove hotplug slot */
                if (rpaphp_deregister_slot(slot)) {
                        printk(KERN_ERR
                                "%s: unable to remove hotplug slot %s\n",
                                __FUNCTION__, drc_name);
                        return -EIO;
                }
-        } else {
+        } else
-                struct pci_dev *dev, *tmp;
+                pcibios_remove_pci_devices(bus);
-                list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
-                        eeh_remove_bus_device(dev);
-                        pci_remove_bus_device(dev);
-                }
-        }
        if (unmap_bus_range(bus)) {
                printk(KERN_ERR "%s: failed to unmap bus range\n",
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 2e7accf0f734..c822a779653f 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -83,19 +83,15 @@ struct slot {
 extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
 extern struct list_head rpaphp_slot_head;
-extern int num_slots;
 /* function prototypes */
 /* rpaphp_pci.c */
-extern int rpaphp_enable_pci_slot(struct slot *slot);
+extern int rpaphp_enable_slot(struct slot *slot);
-extern int rpaphp_register_pci_slot(struct slot *slot);
-extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
 extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
-extern int rpaphp_remove_slot(struct slot *slot);
 extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
                char **drc_name, char **drc_type, int *drc_power_domain);
@@ -104,7 +100,5 @@ extern void dealloc_slot_struct(struct slot *slot);
 extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
 extern int rpaphp_register_slot(struct slot *slot);
 extern int rpaphp_deregister_slot(struct slot *slot);
-extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
-extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
        
 #endif                          /* _PPC64PHP_H */
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 71a2cb8baa4a..847936fe327e 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -39,9 +39,7 @@
 #include "rpaphp.h"
 int debug;
-static struct semaphore rpaphp_sem;
 LIST_HEAD(rpaphp_slot_head);
-int num_slots;
 #define DRIVER_VERSION  "0.1"
 #define DRIVER_AUTHOR   "Linda Xie <lxie@us.ibm.com>"
@@ -55,11 +53,6 @@ MODULE_LICENSE("GPL");
 module_param(debug, bool, 0644);
-static int rpaphp_get_attention_status(struct slot *slot)
-{
-        return slot->hotplug_slot->info->attention_status;
-}
 /**
 * set_attention_status - set attention LED
 * echo 0 > attention -- set LED OFF
@@ -69,79 +62,75 @@ static int rpaphp_get_attention_status(struct slot *slot)
 */
 static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 {
-        int retval = 0;
+        int rc;
        struct slot *slot = (struct slot *)hotplug_slot->private;
-        down(&rpaphp_sem);
        switch (value) {
        case 0:
-                retval = rpaphp_set_attention_status(slot, LED_OFF);
-                hotplug_slot->info->attention_status = 0;
-                break;
        case 1:
-        default:
-                retval = rpaphp_set_attention_status(slot, LED_ON);
-                hotplug_slot->info->attention_status = 1;
-                break;
        case 2:
-                retval = rpaphp_set_attention_status(slot, LED_ID);
+                break;
-                hotplug_slot->info->attention_status = 2;
+        default:
+                value = 1;
                break;
        }
-        up(&rpaphp_sem);
-        return retval;
+        rc = rtas_set_indicator(DR_INDICATOR, slot->index, value);
+        if (!rc)
+                hotplug_slot->info->attention_status = value;
+        return rc;
 }
 /**
 * get_power_status - get power status of a slot
 * @hotplug_slot: slot to get status
 * @value: pointer to store status
- *
- *
 */
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
-        int retval;
+        int retval, level;
        struct slot *slot = (struct slot *)hotplug_slot->private;
-        down(&rpaphp_sem);
+        retval = rtas_get_power_level (slot->power_domain, &level);
-        retval = rpaphp_get_power_status(slot, value);
+        if (!retval)
-        up(&rpaphp_sem);
+                *value = level;
        return retval;
 }
 /**
 * get_attention_status - get attention LED status
- *
- *
 */
 static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
-        int retval = 0;
        struct slot *slot = (struct slot *)hotplug_slot->private;
+        *value = slot->hotplug_slot->info->attention_status;
-        down(&rpaphp_sem);
+        return 0;
-        *value = rpaphp_get_attention_status(slot);
-        up(&rpaphp_sem);
-        return retval;
 }
 static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
        struct slot *slot = (struct slot *)hotplug_slot->private;
-        int retval = 0;
+        int rc, state;
-        down(&rpaphp_sem);
+        rc = rpaphp_get_sensor_state(slot, &state);
-        retval = rpaphp_get_pci_adapter_status(slot, 0, value);
-        up(&rpaphp_sem);
+        *value = NOT_VALID;
-        return retval;
+        if (rc)
+                return rc;
+        if (state == EMPTY)
+                *value = EMPTY;
+        else if (state == PRESENT)
+                *value = slot->state;
+        return 0;
 }
 static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
        struct slot *slot = (struct slot *)hotplug_slot->private;
-        down(&rpaphp_sem);
        switch (slot->type) {
        case 1:
        case 2:
@@ -172,7 +161,6 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
                break;
        }
-        up(&rpaphp_sem);
        return 0;
 }
@@ -265,6 +253,14 @@ static int is_php_type(char *drc_type)
        return 1;
 }
+/**
+ * is_php_dn() - return 1 if this is a hotpluggable pci slot, else 0
+ *
+ * This routine will return true only if the device node is
+ * a hotpluggable slot. This routine will return false
+ * for built-in pci slots (even when the built-in slots are
+ * dlparable.)
+ */
 static int is_php_dn(struct device_node *dn, const int **indexes,
                const int **names, const int **types, const int **power_domains)
 {
@@ -272,24 +268,31 @@ static int is_php_dn(struct device_node *dn, const int **indexes,
        int rc;
        rc = get_children_props(dn, indexes, names, &drc_types, power_domains);
-        if (rc >= 0) {
+        if (rc < 0)
-                if (is_php_type((char *) &drc_types[1])) {
+                return 0;
-                        *types = drc_types;
-                        return 1;
-                }
-        }
-        return 0;
+        if (!is_php_type((char *) &drc_types[1]))
+                return 0;
+        *types = drc_types;
+        return 1;
 }
 /**
- * rpaphp_add_slot -- add hotplug or dlpar slot
+ * rpaphp_add_slot -- declare a hotplug slot to the hotplug subsystem.
+ * @dn device node of slot
+ *
+ * This subroutine will register a hotplugable slot with the
+ * PCI hotplug infrastructure. This routine is typicaly called
+ * during boot time, if the hotplug slots are present at boot time,
+ * or is called later, by the dlpar add code, if the slot is
+ * being dynamically added during runtime.
+ *
+ * If the device node points at an embedded (built-in) slot, this
+ * routine will just return without doing anything, since embedded
+ * slots cannot be hotplugged.
 *
- *      rpaphp not only registers PCI hotplug slots(HOTPLUG), 
+ * To remove a slot, it suffices to call rpaphp_deregister_slot()
- *      but also logical DR slots(EMBEDDED).
- *      HOTPLUG slot: An adapter can be physically added/removed. 
- *      EMBEDDED slot: An adapter can be logically removed/added
- *                from/to a partition with the slot.
 */
 int rpaphp_add_slot(struct device_node *dn)
 {
@@ -299,34 +302,42 @@ int rpaphp_add_slot(struct device_node *dn)
        const int *indexes, *names, *types, *power_domains;
        char *name, *type;
+        if (!dn->name || strcmp(dn->name, "pci"))
+                return 0;
+        /* If this is not a hotplug slot, return without doing anything. */
+        if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
+                return 0;
        dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name);
        /* register PCI devices */
-        if (dn->name != 0 && strcmp(dn->name, "pci") == 0) {
+        name = (char *) &names[1];
-                if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
+        type = (char *) &types[1];
-                        goto exit;
+        for (i = 0; i < indexes[0]; i++) {
-                name = (char *) &names[1];
+                slot = alloc_slot_struct(dn, indexes[i + 1], name, power_domains[i + 1]);
-                type = (char *) &types[1];
+                if (!slot)
-                for (i = 0; i < indexes[0]; i++,
+                        return -ENOMEM;
-                        name += (strlen(name) + 1), type += (strlen(type) + 1))                 {
+                slot->type = simple_strtoul(type, NULL, 10);
-                        if (!(slot = alloc_slot_struct(dn, indexes[i + 1], name,
-                                       power_domains[i + 1]))) {
-                                retval = -ENOMEM;
-                                goto exit;
-                        }
-                        slot->type = simple_strtoul(type, NULL, 10);
                                
-                        dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
+                dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
-                                        indexes[i + 1], name, type);
+                                indexes[i + 1], name, type);
-                        retval = rpaphp_register_pci_slot(slot);
+                retval = rpaphp_enable_slot(slot);
-                }
+                if (!retval)
+                        retval = rpaphp_register_slot(slot);
+                if (retval)
+                        dealloc_slot_struct(slot);
+                name += strlen(name) + 1;
+                type += strlen(type) + 1;
        }
-exit:
+        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
-        dbg("%s - Exit: num_slots=%d rc[%d]\n",
-            __FUNCTION__, num_slots, retval);
+        /* XXX FIXME: reports a failure only if last entry in loop failed */
        return retval;
 }
@@ -354,7 +365,6 @@ static int __init rpaphp_init(void)
        struct device_node *dn = NULL;
        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-        init_MUTEX(&rpaphp_sem);
        while ((dn = of_find_node_by_name(dn, "pci")))
                rpaphp_add_slot(dn);
@@ -367,8 +377,9 @@ static void __exit rpaphp_exit(void)
        cleanup_slots();
 }
-static int __enable_slot(struct slot *slot)
+static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
+        struct slot *slot = (struct slot *)hotplug_slot->private;
        int state;
        int retval;
@@ -392,46 +403,17 @@ static int __enable_slot(struct slot *slot)
        return 0;
 }
-static int enable_slot(struct hotplug_slot *hotplug_slot)
+static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
-        int retval;
        struct slot *slot = (struct slot *)hotplug_slot->private;
-        down(&rpaphp_sem);
-        retval = __enable_slot(slot);
-        up(&rpaphp_sem);
-        return retval;
-}
-static int __disable_slot(struct slot *slot)
-{
-        struct pci_dev *dev, *tmp;
        if (slot->state == NOT_CONFIGURED)
                return -EINVAL;
-        list_for_each_entry_safe(dev, tmp, &slot->bus->devices, bus_list) {
+        pcibios_remove_pci_devices(slot->bus);
-                eeh_remove_bus_device(dev);
-                pci_remove_bus_device(dev);
-        }
        slot->state = NOT_CONFIGURED;
        return 0;
 }
-static int disable_slot(struct hotplug_slot *hotplug_slot)
-{
-        struct slot *slot = (struct slot *)hotplug_slot->private;
-        int retval;
-        down(&rpaphp_sem);
-        retval = __disable_slot (slot);
-        up(&rpaphp_sem);
-        return retval;
-}
 struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
        .owner = THIS_MODULE,
        .enable_slot = enable_slot,
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 6f6cbede5135..54ca8650d511 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -64,75 +64,6 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state)
        return rc;
 }
-/**
- * get_pci_adapter_status - get the status of a slot
- * 
- * 0-- slot is empty
- * 1-- adapter is configured
- * 2-- adapter is not configured
- * 3-- not valid
- */
-int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value)
-{
-        struct pci_bus *bus;
-        int state, rc;
-        *value = NOT_VALID;
-        rc = rpaphp_get_sensor_state(slot, &state);
-        if (rc)
-                goto exit;
-        if (state == EMPTY)
-                *value = EMPTY;
-        else if (state == PRESENT) {
-                if (!is_init) {
-                        /* at run-time slot->state can be changed by */
-                        /* config/unconfig adapter */
-                        *value = slot->state;
-                } else {
-                        bus = pcibios_find_pci_bus(slot->dn);
-                        if (bus && !list_empty(&bus->devices))
-                                *value = CONFIGURED;
-                        else
-                                *value = NOT_CONFIGURED;
-                }
-        }
-exit:
-        return rc;
-}
-static void print_slot_pci_funcs(struct pci_bus *bus)
-{
-        struct device_node *dn;
-        struct pci_dev *dev;
-        dn = pci_bus_to_OF_node(bus);
-        if (!dn)
-                return;
-        dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, dn->full_name);
-        list_for_each_entry (dev, &bus->devices, bus_list)
-                dbg("\t%s\n", pci_name(dev));
-        return;
-}
-static int setup_pci_hotplug_slot_info(struct slot *slot)
-{
-        struct hotplug_slot_info *hotplug_slot_info = slot->hotplug_slot->info;
-        dbg("%s Initilize the PCI slot's hotplug->info structure ...\n",
-            __FUNCTION__);
-        rpaphp_get_power_status(slot, &hotplug_slot_info->power_status);
-        rpaphp_get_pci_adapter_status(slot, 1,
-                                      &hotplug_slot_info->adapter_status);
-        if (hotplug_slot_info->adapter_status == NOT_VALID) {
-                err("%s: NOT_VALID: skip dn->full_name=%s\n",
-                    __FUNCTION__, slot->dn->full_name);
-                return -EINVAL;
-        }
-        return 0;
-}
 static void set_slot_name(struct slot *slot)
 {
        struct pci_bus *bus = slot->bus;
@@ -146,69 +77,73 @@ static void set_slot_name(struct slot *slot)
                        bus->number);
 }
-static int setup_pci_slot(struct slot *slot)
+/**
+ * rpaphp_enable_slot - record slot state, config pci device
+ *
+ * Initialize values in the slot, and the hotplug_slot info
+ * structures to indicate if there is a pci card plugged into
+ * the slot. If the slot is not empty, run the pcibios routine
+ * to get pcibios stuff correctly set up.
+ */
+int rpaphp_enable_slot(struct slot *slot)
 {
-        struct device_node *dn = slot->dn;
+        int rc, level, state;
        struct pci_bus *bus;
+        struct hotplug_slot_info *info = slot->hotplug_slot->info;
+        info->adapter_status = NOT_VALID;
+        slot->state = EMPTY;
+        /* Find out if the power is turned on for the slot */
+        rc = rtas_get_power_level(slot->power_domain, &level);
+        if (rc)
+                return rc;
+        info->power_status = level;
+        /* Figure out if there is an adapter in the slot */
+        rc = rpaphp_get_sensor_state(slot, &state);
+        if (rc)
+                return rc;
-        BUG_ON(!dn);
+        bus = pcibios_find_pci_bus(slot->dn);
-        bus = pcibios_find_pci_bus(dn);
        if (!bus) {
-                err("%s: no pci_bus for dn %s\n", __FUNCTION__, dn->full_name);
+                err("%s: no pci_bus for dn %s\n", __FUNCTION__, slot->dn->full_name);
-                goto exit_rc;
+                return -EINVAL;
        }
+        info->adapter_status = EMPTY;
        slot->bus = bus;
        slot->pci_devs = &bus->devices;
        set_slot_name(slot);
-        /* find slot's pci_dev if it's not empty */
+        /* if there's an adapter in the slot, go add the pci devices */
-        if (slot->hotplug_slot->info->adapter_status == EMPTY) {
+        if (state == PRESENT) {
-                slot->state = EMPTY;    /* slot is empty */
+                info->adapter_status = NOT_CONFIGURED;
-        } else {
+                slot->state = NOT_CONFIGURED;
-                /* slot is occupied */
-                if (!dn->child) {
+                /* non-empty slot has to have child */
-                        /* non-empty slot has to have child */
+                if (!slot->dn->child) {
-                        err("%s: slot[%s]'s device_node doesn't have child for adapter\n", 
+                        err("%s: slot[%s]'s device_node doesn't have child for adapter\n",
-                                __FUNCTION__, slot->name);
+                            __FUNCTION__, slot->name);
-                        goto exit_rc;
+                        return -EINVAL;
                }
-                if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
+                if (list_empty(&bus->devices))
-                        dbg("%s CONFIGURING pci adapter in slot[%s]\n",  
+                        pcibios_add_pci_devices(bus);
-                                __FUNCTION__, slot->name);
-                        pcibios_add_pci_devices(slot->bus);
-                } else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
+                if (!list_empty(&bus->devices)) {
-                        err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
+                        info->adapter_status = CONFIGURED;
-                                __FUNCTION__, slot->name);
-                        goto exit_rc;
-                }
-                print_slot_pci_funcs(slot->bus);
-                if (!list_empty(slot->pci_devs)) {
                        slot->state = CONFIGURED;
-                } else {
+                }
-                        /* DLPAR add as opposed to 
-                         * boot time */
+                if (debug) {
-                        slot->state = NOT_CONFIGURED;
+                        struct pci_dev *dev;
+                        dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, slot->dn->full_name);
+                        list_for_each_entry (dev, &bus->devices, bus_list)
+                                dbg("\t%s\n", pci_name(dev));
                }
        }
-        return 0;
-exit_rc:
-        dealloc_slot_struct(slot);
-        return -EINVAL;
-}
-int rpaphp_register_pci_slot(struct slot *slot)
+        return 0;
-{
-        int rc = -EINVAL;
-        if (setup_pci_hotplug_slot_info(slot))
-                goto exit_rc;
-        if (setup_pci_slot(slot))
-                goto exit_rc;
-        rc = rpaphp_register_slot(slot);
-exit_rc:
-        return rc;
 }
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 3009193f0058..d4ee8723fcb3 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -56,7 +56,6 @@ static struct hotplug_slot_attribute php_attr_location = {
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = (struct slot *) hotplug_slot->private;
        dealloc_slot_struct(slot);
 }
@@ -65,12 +64,12 @@ void dealloc_slot_struct(struct slot *slot)
        kfree(slot->hotplug_slot->info);
        kfree(slot->hotplug_slot->name);
        kfree(slot->hotplug_slot);
+        kfree(slot->location);
        kfree(slot);
-        return;
 }
-struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name,
+struct slot *alloc_slot_struct(struct device_node *dn,
-                  int power_domain)
+                       int drc_index, char *drc_name, int power_domain)
 {
        struct slot *slot;
        
@@ -115,7 +114,7 @@ error_nomem:
 static int is_registered(struct slot *slot)
 {
-        struct slot             *tmp_slot;
+        struct slot *tmp_slot;
        list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) {
                if (!strcmp(tmp_slot->name, slot->name))
@@ -140,8 +139,6 @@ int rpaphp_deregister_slot(struct slot *slot)
        retval = pci_hp_deregister(php_slot);
        if (retval)
                err("Problem unregistering a slot %s\n", slot->name);
-        else
-                num_slots--;
        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
        return retval;
@@ -160,14 +157,13 @@ int rpaphp_register_slot(struct slot *slot)
        /* should not try to register the same slot twice */
        if (is_registered(slot)) {
                err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-                retval = -EAGAIN;
+                return -EAGAIN;
-                goto register_fail;
        }       
        retval = pci_hp_register(php_slot);
        if (retval) {
                err("pci_hp_register failed with error %d\n", retval);
-                goto register_fail;
+                return retval;
        }
        /* create "phy_location" file */
@@ -181,43 +177,10 @@ int rpaphp_register_slot(struct slot *slot)
        list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
        info("Slot [%s](PCI location=%s) registered\n", slot->name,
                        slot->location);
-        num_slots++;
        return 0;
 sysfs_fail:
        pci_hp_deregister(php_slot);
-register_fail:
-        rpaphp_release_slot(php_slot);
        return retval;
 }
-int rpaphp_get_power_status(struct slot *slot, u8 * value)
-{
-        int rc = 0, level;
-        
-        rc = rtas_get_power_level(slot->power_domain, &level);
-        if (rc < 0) {
-                err("failed to get power-level for slot(%s), rc=0x%x\n",
-                        slot->location, rc);
-                return rc;
-        }
-        dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
-                __FUNCTION__, slot->name, slot->power_domain, level);
-        *value = level;
-        return rc;
-}
-int rpaphp_set_attention_status(struct slot *slot, u8 status)
-{
-        int rc;
-        /* status: LED_OFF or LED_ON */
-        rc = rtas_set_indicator(DR_INDICATOR, slot->index, status);
-        if (rc < 0)
-                err("slot(name=%s location=%s index=0x%x) set attention-status(%d) failed! rc=0x%x\n",
-                    slot->name, slot->location, slot->index, status, rc);
-        return rc;
-}
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 01d31a1f697c..37ed0884b972 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -166,7 +166,7 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
 extern int shpchp_configure_device(struct slot *p_slot);
 extern int shpchp_unconfigure_device(struct slot *p_slot);
 extern void cleanup_slots(struct controller *ctrl);
-extern void queue_pushbutton_work(struct work_struct *work);
+extern void shpchp_queue_pushbutton_work(struct work_struct *work);
 extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
 #ifdef CONFIG_ACPI
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 5f4bc08a633a..80dec9796b31 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -136,7 +136,7 @@ static int init_slots(struct controller *ctrl)
                slot->hpc_ops = ctrl->hpc_ops;
                slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
                mutex_init(&slot->lock);
-                INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);
+                INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work);
                /* register this slot with the hotplug pci core */
                hotplug_slot->private = slot;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index b746bd265bc6..2c94d44279a3 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -433,7 +433,7 @@ static void shpchp_pushbutton_thread(struct work_struct *work)
        kfree(info);
 }
-void queue_pushbutton_work(struct work_struct *work)
+void shpchp_queue_pushbutton_work(struct work_struct *work)
 {
        struct slot *p_slot = container_of(work, struct slot, work.work);
        struct pushbutton_work_info *info;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 435c1958a7b7..9e1321d0d5e6 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -24,20 +24,8 @@
 #include "pci.h"
 #include "msi.h"
-static struct kmem_cache* msi_cachep;
 static int pci_msi_enable = 1;
-static int msi_cache_init(void)
-{
-        msi_cachep = kmem_cache_create("msi_cache", sizeof(struct msi_desc),
-                                        0, SLAB_HWCACHE_ALIGN, NULL, NULL);
-        if (!msi_cachep)
-                return -ENOMEM;
-        return 0;
-}
 static void msi_set_enable(struct pci_dev *dev, int enable)
 {
        int pos;
@@ -68,6 +56,29 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
        }
 }
+static void msix_flush_writes(unsigned int irq)
+{
+        struct msi_desc *entry;
+        entry = get_irq_msi(irq);
+        BUG_ON(!entry || !entry->dev);
+        switch (entry->msi_attrib.type) {
+        case PCI_CAP_ID_MSI:
+                /* nothing to do */
+                break;
+        case PCI_CAP_ID_MSIX:
+        {
+                int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
+                readl(entry->mask_base + offset);
+                break;
+        }
+        default:
+                BUG();
+                break;
+        }
+}
 static void msi_set_mask_bit(unsigned int irq, int flag)
 {
        struct msi_desc *entry;
@@ -187,41 +198,28 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
 void mask_msi_irq(unsigned int irq)
 {
        msi_set_mask_bit(irq, 1);
+        msix_flush_writes(irq);
 }
 void unmask_msi_irq(unsigned int irq)
 {
        msi_set_mask_bit(irq, 0);
+        msix_flush_writes(irq);
 }
-static int msi_free_irq(struct pci_dev* dev, int irq);
+static int msi_free_irqs(struct pci_dev* dev);
-static int msi_init(void)
-{
-        static int status = -ENOMEM;
-        if (!status)
-                return status;
-        status = msi_cache_init();
-        if (status < 0) {
-                pci_msi_enable = 0;
-                printk(KERN_WARNING "PCI: MSI cache init failed\n");
-                return status;
-        }
-        return status;
-}
 static struct msi_desc* alloc_msi_entry(void)
 {
        struct msi_desc *entry;
-        entry = kmem_cache_zalloc(msi_cachep, GFP_KERNEL);
+        entry = kzalloc(sizeof(struct msi_desc), GFP_KERNEL);
        if (!entry)
                return NULL;
-        entry->link.tail = entry->link.head = 0;        /* single message */
+        INIT_LIST_HEAD(&entry->list);
+        entry->irq = 0;
        entry->dev = NULL;
        return entry;
@@ -256,7 +254,6 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
 static void __pci_restore_msix_state(struct pci_dev *dev)
 {
        int pos;
-        int irq, head, tail = 0;
        struct msi_desc *entry;
        u16 control;
@@ -266,18 +263,15 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
        /* route the table */
        pci_intx(dev, 0);               /* disable intx */
        msix_set_enable(dev, 0);
-        irq = head = dev->first_msi_irq;
-        entry = get_irq_msi(irq);
-        pos = entry->msi_attrib.pos;
-        while (head != tail) {
-                entry = get_irq_msi(irq);
-                write_msi_msg(irq, &entry->msg);
-                msi_set_mask_bit(irq, entry->msi_attrib.masked);
-                tail = entry->link.tail;
+        list_for_each_entry(entry, &dev->msi_list, list) {
-                irq = tail;
+                write_msi_msg(entry->irq, &entry->msg);
+                msi_set_mask_bit(entry->irq, entry->msi_attrib.masked);
        }
+        BUG_ON(list_empty(&dev->msi_list));
+        entry = list_entry(dev->msi_list.next, struct msi_desc, list);
+        pos = entry->msi_attrib.pos;
        pci_read_config_word(dev, pos + PCI_MSIX_FLAGS, &control);
        control &= ~PCI_MSIX_FLAGS_MASKALL;
        control |= PCI_MSIX_FLAGS_ENABLE;
@@ -303,7 +297,7 @@ void pci_restore_msi_state(struct pci_dev *dev)
 static int msi_capability_init(struct pci_dev *dev)
 {
        struct msi_desc *entry;
-        int pos, irq;
+        int pos, ret;
        u16 control;
        msi_set_enable(dev, 0); /* Ensure msi is disabled as I set it up */
@@ -340,23 +334,21 @@ static int msi_capability_init(struct pci_dev *dev)
                        msi_mask_bits_reg(pos, is_64bit_address(control)),
                        maskbits);
        }
+        list_add(&entry->list, &dev->msi_list);
        /* Configure MSI capability structure */
-        irq = arch_setup_msi_irq(dev, entry);
+        ret = arch_setup_msi_irqs(dev, 1, PCI_CAP_ID_MSI);
-        if (irq < 0) {
+        if (ret) {
-                kmem_cache_free(msi_cachep, entry);
+                msi_free_irqs(dev);
-                return irq;
+                return ret;
        }
-        entry->link.head = irq;
-        entry->link.tail = irq;
-        dev->first_msi_irq = irq;
-        set_irq_msi(irq, entry);
        /* Set MSI enabled bits  */
        pci_intx(dev, 0);               /* disable intx */
        msi_set_enable(dev, 1);
        dev->msi_enabled = 1;
-        dev->irq = irq;
+        dev->irq = entry->irq;
        return 0;
 }
@@ -373,8 +365,8 @@ static int msi_capability_init(struct pci_dev *dev)
 static int msix_capability_init(struct pci_dev *dev,
                                struct msix_entry *entries, int nvec)
 {
-        struct msi_desc *head = NULL, *tail = NULL, *entry = NULL;
+        struct msi_desc *entry;
-        int irq, pos, i, j, nr_entries, temp = 0;
+        int pos, i, j, nr_entries, ret;
        unsigned long phys_addr;
        u32 table_offset;
        u16 control;
@@ -413,44 +405,34 @@ static int msix_capability_init(struct pci_dev *dev,
                entry->dev = dev;
                entry->mask_base = base;
-                /* Configure MSI-X capability structure */
+                list_add(&entry->list, &dev->msi_list);
-                irq = arch_setup_msi_irq(dev, entry);
-                if (irq < 0) {
-                        kmem_cache_free(msi_cachep, entry);
-                        break;
-                }
-                entries[i].vector = irq;
-                if (!head) {
-                        entry->link.head = irq;
-                        entry->link.tail = irq;
-                        head = entry;
-                } else {
-                        entry->link.head = temp;
-                        entry->link.tail = tail->link.tail;
-                        tail->link.tail = irq;
-                        head->link.head = irq;
-                }
-                temp = irq;
-                tail = entry;
-                set_irq_msi(irq, entry);
        }
-        if (i != nvec) {
-                int avail = i - 1;
+        ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
-                i--;
+        if (ret) {
-                for (; i >= 0; i--) {
+                int avail = 0;
-                        irq = (entries + i)->vector;
+                list_for_each_entry(entry, &dev->msi_list, list) {
-                        msi_free_irq(dev, irq);
+                        if (entry->irq != 0) {
-                        (entries + i)->vector = 0;
+                                avail++;
+                        }
                }
+                msi_free_irqs(dev);
                /* If we had some success report the number of irqs
                 * we succeeded in setting up.
                 */
-                if (avail <= 0)
+                if (avail == 0)
-                        avail = -EBUSY;
+                        avail = ret;
                return avail;
        }
-        dev->first_msi_irq = entries[0].vector;
+        i = 0;
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                entries[i].vector = entry->irq;
+                set_irq_msi(entry->irq, entry);
+                i++;
+        }
        /* Set MSI-X enabled bits */
        pci_intx(dev, 0);               /* disable intx */
        msix_set_enable(dev, 1);
@@ -460,21 +442,32 @@ static int msix_capability_init(struct pci_dev *dev,
 }
 /**
- * pci_msi_supported - check whether MSI may be enabled on device
+ * pci_msi_check_device - check whether MSI may be enabled on a device
 * @dev: pointer to the pci_dev data structure of MSI device function
+ * @nvec: how many MSIs have been requested ?
+ * @type: are we checking for MSI or MSI-X ?
 *
 * Look at global flags, the device itself, and its parent busses
- * to return 0 if MSI are supported for the device.
+ * to determine if MSI/-X are supported for the device. If MSI/-X is
+ * supported return 0, else return an error code.
 **/
-static
+static int pci_msi_check_device(struct pci_dev* dev, int nvec, int type)
-int pci_msi_supported(struct pci_dev * dev)
 {
        struct pci_bus *bus;
+        int ret;
        /* MSI must be globally enabled and supported by the device */
        if (!pci_msi_enable || !dev || dev->no_msi)
                return -EINVAL;
+        /*
+         * You can't ask to have 0 or less MSIs configured.
+         *  a) it's stupid ..
+         *  b) the list manipulation code assumes nvec >= 1.
+         */
+        if (nvec < 1)
+                return -ERANGE;
        /* Any bridge which does NOT route MSI transactions from it's
         * secondary bus to it's primary bus must set NO_MSI flag on
         * the secondary pci_bus.
@@ -485,6 +478,13 @@ int pci_msi_supported(struct pci_dev * dev)
                if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
                        return -EINVAL;
+        ret = arch_msi_check_device(dev, nvec, type);
+        if (ret)
+                return ret;
+        if (!pci_find_capability(dev, type))
+                return -EINVAL;
        return 0;
 }
@@ -500,19 +500,12 @@ int pci_msi_supported(struct pci_dev * dev)
 **/
 int pci_enable_msi(struct pci_dev* dev)
 {
-        int pos, status;
+        int status;
-        if (pci_msi_supported(dev) < 0)
-                return -EINVAL;
-        status = msi_init();
+        status = pci_msi_check_device(dev, 1, PCI_CAP_ID_MSI);
-        if (status < 0)
+        if (status)
                return status;
-        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
-        if (!pos)
-                return -EINVAL;
        WARN_ON(!!dev->msi_enabled);
        /* Check whether driver already requested for MSI-X irqs */
@@ -525,69 +518,54 @@ int pci_enable_msi(struct pci_dev* dev)
        status = msi_capability_init(dev);
        return status;
 }
+EXPORT_SYMBOL(pci_enable_msi);
 void pci_disable_msi(struct pci_dev* dev)
 {
        struct msi_desc *entry;
        int default_irq;
-        if (!pci_msi_enable)
+        if (!pci_msi_enable || !dev || !dev->msi_enabled)
-                return;
-        if (!dev)
-                return;
-        if (!dev->msi_enabled)
                return;
        msi_set_enable(dev, 0);
        pci_intx(dev, 1);               /* enable intx */
        dev->msi_enabled = 0;
-        entry = get_irq_msi(dev->first_msi_irq);
+        BUG_ON(list_empty(&dev->msi_list));
-        if (!entry || !entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
+        entry = list_entry(dev->msi_list.next, struct msi_desc, list);
+        if (!entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {
                return;
        }
-        if (irq_has_action(dev->first_msi_irq)) {
-                printk(KERN_WARNING "PCI: %s: pci_disable_msi() called without "
+        default_irq = entry->msi_attrib.default_irq;
-                       "free_irq() on MSI irq %d\n",
+        msi_free_irqs(dev);
-                       pci_name(dev), dev->first_msi_irq);
-                BUG_ON(irq_has_action(dev->first_msi_irq));
+        /* Restore dev->irq to its default pin-assertion irq */
-        } else {
+        dev->irq = default_irq;
-                default_irq = entry->msi_attrib.default_irq;
-                msi_free_irq(dev, dev->first_msi_irq);
-                /* Restore dev->irq to its default pin-assertion irq */
-                dev->irq = default_irq;
-        }
-        dev->first_msi_irq = 0;
 }
+EXPORT_SYMBOL(pci_disable_msi);
-static int msi_free_irq(struct pci_dev* dev, int irq)
+static int msi_free_irqs(struct pci_dev* dev)
 {
-        struct msi_desc *entry;
+        struct msi_desc *entry, *tmp;
-        int head, entry_nr, type;
-        void __iomem *base;
-        entry = get_irq_msi(irq);
+        list_for_each_entry(entry, &dev->msi_list, list)
-        if (!entry || entry->dev != dev) {
+                BUG_ON(irq_has_action(entry->irq));
-                return -EINVAL;
-        }
+        arch_teardown_msi_irqs(dev);
-        type = entry->msi_attrib.type;
-        entry_nr = entry->msi_attrib.entry_nr;
+        list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) {
-        head = entry->link.head;
+                if (entry->msi_attrib.type == PCI_CAP_ID_MSIX) {
-        base = entry->mask_base;
+                        if (list_is_last(&entry->list, &dev->msi_list))
-        get_irq_msi(entry->link.head)->link.tail = entry->link.tail;
+                                iounmap(entry->mask_base);
-        get_irq_msi(entry->link.tail)->link.head = entry->link.head;
+                        writel(1, entry->mask_base + entry->msi_attrib.entry_nr
-        arch_teardown_msi_irq(irq);
+                                  * PCI_MSIX_ENTRY_SIZE
-        kmem_cache_free(msi_cachep, entry);
+                                  + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+                }
-        if (type == PCI_CAP_ID_MSIX) {
+                list_del(&entry->list);
-                writel(1, base + entry_nr * PCI_MSIX_ENTRY_SIZE +
+                kfree(entry);
-                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
-                if (head == irq)
-                        iounmap(base);
        }
        return 0;
@@ -614,17 +592,14 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
        int i, j;
        u16 control;
-        if (!entries || pci_msi_supported(dev) < 0)
+        if (!entries)
                return -EINVAL;
-        status = msi_init();
+        status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);
-        if (status < 0)
+        if (status)
                return status;
        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
-        if (!pos)
-                return -EINVAL;
        pci_read_config_word(dev, msi_control_reg(pos), &control);
        nr_entries = multi_msix_capable(control);
        if (nvec > nr_entries)
@@ -651,41 +626,25 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
        status = msix_capability_init(dev, entries, nvec);
        return status;
 }
+EXPORT_SYMBOL(pci_enable_msix);
-void pci_disable_msix(struct pci_dev* dev)
+static void msix_free_all_irqs(struct pci_dev *dev)
 {
-        int irq, head, tail = 0, warning = 0;
+        msi_free_irqs(dev);
+}
-        if (!pci_msi_enable)
-                return;
-        if (!dev)
-                return;
-        if (!dev->msix_enabled)
+void pci_disable_msix(struct pci_dev* dev)
+{
+        if (!pci_msi_enable || !dev || !dev->msix_enabled)
                return;
        msix_set_enable(dev, 0);
        pci_intx(dev, 1);               /* enable intx */
        dev->msix_enabled = 0;
-        irq = head = dev->first_msi_irq;
+        msix_free_all_irqs(dev);
-        while (head != tail) {
-                tail = get_irq_msi(irq)->link.tail;
-                if (irq_has_action(irq))
-                        warning = 1;
-                else if (irq != head)   /* Release MSI-X irq */
-                        msi_free_irq(dev, irq);
-                irq = tail;
-        }
-        msi_free_irq(dev, irq);
-        if (warning) {
-                printk(KERN_WARNING "PCI: %s: pci_disable_msix() called without "
-                        "free_irq() on all MSI-X irqs\n",
-                        pci_name(dev));
-                BUG_ON(warning > 0);
-        }
-        dev->first_msi_irq = 0;
 }
+EXPORT_SYMBOL(pci_disable_msix);
 /**
 * msi_remove_pci_irq_vectors - reclaim MSI(X) irqs to unused state
@@ -701,38 +660,11 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
        if (!pci_msi_enable || !dev)
                return;
-        if (dev->msi_enabled) {
+        if (dev->msi_enabled)
-                if (irq_has_action(dev->first_msi_irq)) {
+                msi_free_irqs(dev);
-                        printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                               "called without free_irq() on MSI irq %d\n",
+        if (dev->msix_enabled)
-                               pci_name(dev), dev->first_msi_irq);
+                msix_free_all_irqs(dev);
-                        BUG_ON(irq_has_action(dev->first_msi_irq));
-                } else /* Release MSI irq assigned to this device */
-                        msi_free_irq(dev, dev->first_msi_irq);
-        }
-        if (dev->msix_enabled) {
-                int irq, head, tail = 0, warning = 0;
-                void __iomem *base = NULL;
-                irq = head = dev->first_msi_irq;
-                while (head != tail) {
-                        tail = get_irq_msi(irq)->link.tail;
-                        base = get_irq_msi(irq)->mask_base;
-                        if (irq_has_action(irq))
-                                warning = 1;
-                        else if (irq != head) /* Release MSI-X irq */
-                                msi_free_irq(dev, irq);
-                        irq = tail;
-                }
-                msi_free_irq(dev, irq);
-                if (warning) {
-                        iounmap(base);
-                        printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-                               "called without free_irq() on all MSI-X irqs\n",
-                               pci_name(dev));
-                        BUG_ON(warning > 0);
-                }
-        }
 }
 void pci_no_msi(void)
@@ -740,7 +672,53 @@ void pci_no_msi(void)
        pci_msi_enable = 0;
 }
-EXPORT_SYMBOL(pci_enable_msi);
+void pci_msi_init_pci_dev(struct pci_dev *dev)
-EXPORT_SYMBOL(pci_disable_msi);
+{
-EXPORT_SYMBOL(pci_enable_msix);
+        INIT_LIST_HEAD(&dev->msi_list);
-EXPORT_SYMBOL(pci_disable_msix);
+}
+/* Arch hooks */
+int __attribute__ ((weak))
+arch_msi_check_device(struct pci_dev* dev, int nvec, int type)
+{
+        return 0;
+}
+int __attribute__ ((weak))
+arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *entry)
+{
+        return 0;
+}
+int __attribute__ ((weak))
+arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+{
+        struct msi_desc *entry;
+        int ret;
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                ret = arch_setup_msi_irq(dev, entry);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+void __attribute__ ((weak)) arch_teardown_msi_irq(unsigned int irq)
+{
+        return;
+}
+void __attribute__ ((weak))
+arch_teardown_msi_irqs(struct pci_dev *dev)
+{
+        struct msi_desc *entry;
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                if (entry->irq != 0)
+                        arch_teardown_msi_irq(entry->irq);
+        }
+}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 39e80fcef4b3..3bb7739d26a5 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -14,20 +14,6 @@
 #include "pci.h"
 /*
- *  Registration of PCI drivers and handling of hot-pluggable devices.
- */
-/* multithreaded probe logic */
-static int pci_multithread_probe =
-#ifdef CONFIG_PCI_MULTITHREAD_PROBE
-        1;
-#else
-        0;
-#endif
-__module_param_call("", pci_multithread_probe, param_set_bool, param_get_bool, &pci_multithread_probe, 0644);
-/*
 * Dynamic device IDs are disabled for !CONFIG_HOTPLUG
 */
@@ -52,7 +38,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
 {
        struct pci_dynid *dynid;
        struct pci_driver *pdrv = to_pci_driver(driver);
-        __u32 vendor=PCI_ANY_ID, device=PCI_ANY_ID, subvendor=PCI_ANY_ID,
+        __u32 vendor, device, subvendor=PCI_ANY_ID,
                subdevice=PCI_ANY_ID, class=0, class_mask=0;
        unsigned long driver_data=0;
        int fields=0;
@@ -61,7 +47,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
        fields = sscanf(buf, "%x %x %x %x %x %x %lux",
                        &vendor, &device, &subvendor, &subdevice,
                        &class, &class_mask, &driver_data);
-        if (fields < 0)
+        if (fields < 2)
                return -EINVAL;
        dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
@@ -569,7 +555,6 @@ struct bus_type pci_bus_type = {
 static int __init pci_driver_init(void)
 {
-        pci_bus_type.multithread_probe = pci_multithread_probe;
        return bus_register(&pci_bus_type);
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index cd913a2a416f..284e83a527f9 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -620,7 +620,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                goto err_bin_file;
        /* If the device has a ROM, try to expose it in sysfs. */
-        if (pci_resource_len(pdev, PCI_ROM_RESOURCE)) {
+        if (pci_resource_len(pdev, PCI_ROM_RESOURCE) ||
+            (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
                rom_attr = kzalloc(sizeof(*rom_attr), GFP_ATOMIC);
                if (rom_attr) {
                        pdev->rom_attr = rom_attr;
@@ -635,7 +636,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                                goto err_rom;
                } else {
                        retval = -ENOMEM;
-                        goto err_bin_file;
+                        goto err_resource_files;
                }
        }
        /* add platform-specific attributes */
@@ -645,6 +646,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
 err_rom:
        kfree(rom_attr);
+err_resource_files:
+        pci_remove_resource_files(pdev);
 err_bin_file:
        if (pdev->cfg_size < 4096)
                sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);
@@ -695,4 +698,4 @@ static int __init pci_sysfs_init(void)
        return 0;
 }
-__initcall(pci_sysfs_init);
+late_initcall(pci_sysfs_init);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2a458279327a..fd47ac0c4730 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -35,8 +35,7 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE;
 * Given a PCI bus, returns the highest PCI bus number present in the set
 * including the given PCI bus and its list of child PCI buses.
 */
-unsigned char __devinit
+unsigned char pci_bus_max_busnr(struct pci_bus* bus)
-pci_bus_max_busnr(struct pci_bus* bus)
 {
        struct list_head *tmp;
        unsigned char max, n;
@@ -892,6 +891,34 @@ pci_disable_device(struct pci_dev *dev)
 }
 /**
+ * pcibios_set_pcie_reset_state - set reset state for device dev
+ * @dev: the PCI-E device reset
+ * @state: Reset state to enter into
+ *
+ *
+ * Sets the PCI-E reset state for the device. This is the default
+ * implementation. Architecture implementations can override this.
+ */
+int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev,
+                                                        enum pcie_reset_state state)
+{
+        return -EINVAL;
+}
+/**
+ * pci_set_pcie_reset_state - set reset state for device dev
+ * @dev: the PCI-E device reset
+ * @state: Reset state to enter into
+ *
+ *
+ * Sets the PCI reset state for the device.
+ */
+int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state)
+{
+        return pcibios_set_pcie_reset_state(dev, state);
+}
+/**
 * pci_enable_wake - enable PCI device as wakeup event source
 * @dev: PCI device affected
 * @state: PCI state from which device will issue wakeup events
@@ -1295,7 +1322,7 @@ pci_intx(struct pci_dev *pdev, int enable)
 /**
 * pci_msi_off - disables any msi or msix capabilities
- * @pdev: the PCI device to operate on
+ * @dev: the PCI device to operate on
 *
 * If you want to use msi see pci_enable_msi and friends.
 * This is a lower level primitive that allows us to disable
@@ -1427,4 +1454,5 @@ EXPORT_SYMBOL(pci_set_power_state);
 EXPORT_SYMBOL(pci_save_state);
 EXPORT_SYMBOL(pci_restore_state);
 EXPORT_SYMBOL(pci_enable_wake);
+EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 62ea04c8af64..3fec13d3add7 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -47,8 +47,10 @@ extern unsigned int pci_pm_d3_delay;
 #ifdef CONFIG_PCI_MSI
 void pci_no_msi(void);
+extern void pci_msi_init_pci_dev(struct pci_dev *dev);
 #else
 static inline void pci_no_msi(void) { }
+static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
 #endif
 #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2fe1d690eb13..e48fcf089621 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -364,7 +364,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
        }
 }
-static struct pci_bus * __devinit pci_alloc_bus(void)
+static struct pci_bus * pci_alloc_bus(void)
 {
        struct pci_bus *b;
@@ -432,7 +432,7 @@ error_register:
        return NULL;
 }
-struct pci_bus * __devinit pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
+struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
 {
        struct pci_bus *child;
@@ -461,7 +461,7 @@ static void pci_enable_crs(struct pci_dev *dev)
        pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl);
 }
-static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
+static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
 {
        struct pci_bus *parent = child->parent;
@@ -477,7 +477,7 @@ static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child,
        }
 }
-unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
+unsigned int pci_scan_child_bus(struct pci_bus *bus);
 /*
 * If it's a bridge, configure it and scan the bus behind it.
@@ -489,7 +489,7 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
 * them, we proceed to assigning numbers to the remaining buses in
 * order to avoid overlaps between old and new bus numbers.
 */
-int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass)
+int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass)
 {
        struct pci_bus *child;
        int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
@@ -846,6 +846,23 @@ static void pci_release_bus_bridge_dev(struct device *dev)
        kfree(dev);
 }
+struct pci_dev *alloc_pci_dev(void)
+{
+        struct pci_dev *dev;
+        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+        INIT_LIST_HEAD(&dev->global_list);
+        INIT_LIST_HEAD(&dev->bus_list);
+        pci_msi_init_pci_dev(dev);
+        return dev;
+}
+EXPORT_SYMBOL(alloc_pci_dev);
 /*
 * Read the config data for a PCI device, sanity-check it
 * and fill in the dev structure...
@@ -885,7 +902,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)
        if (pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type))
                return NULL;
-        dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        dev = alloc_pci_dev();
        if (!dev)
                return NULL;
@@ -912,7 +929,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)
        return dev;
 }
-void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
+void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
        device_initialize(&dev->dev);
        dev->dev.release = pci_release_dev;
@@ -935,8 +952,7 @@ void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        up_write(&pci_bus_sem);
 }
-struct pci_dev * __devinit
+struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn)
-pci_scan_single_device(struct pci_bus *bus, int devfn)
 {
        struct pci_dev *dev;
@@ -958,7 +974,7 @@ pci_scan_single_device(struct pci_bus *bus, int devfn)
 * discovered devices to the @bus->devices list.  New devices
 * will have an empty dev->global_list head.
 */
-int __devinit pci_scan_slot(struct pci_bus *bus, int devfn)
+int pci_scan_slot(struct pci_bus *bus, int devfn)
 {
        int func, nr = 0;
        int scan_all_fns;
@@ -991,7 +1007,7 @@ int __devinit pci_scan_slot(struct pci_bus *bus, int devfn)
        return nr;
 }
-unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
+unsigned int pci_scan_child_bus(struct pci_bus *bus)
 {
        unsigned int devfn, pass, max = bus->secondary;
        struct pci_dev *dev;
@@ -1041,7 +1057,7 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
        return max;
 }
-struct pci_bus * __devinit pci_create_bus(struct device *parent,
+struct pci_bus * pci_create_bus(struct device *parent,
                int bus, struct pci_ops *ops, void *sysdata)
 {
        int error;
@@ -1119,7 +1135,7 @@ err_out:
 }
 EXPORT_SYMBOL_GPL(pci_create_bus);
-struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
+struct pci_bus *pci_scan_bus_parented(struct device *parent,
                int bus, struct pci_ops *ops, void *sysdata)
 {
        struct pci_bus *b;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 3411483240cd..147d86f8edbf 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1648,6 +1648,8 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev)
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_msi);
 /* Go through the list of Hypertransport capabilities and
 * return 1 if a HT MSI capability is found and enabled */
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 2dd8681d6b31..b137a27472c7 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -15,8 +15,7 @@
 DECLARE_RWSEM(pci_bus_sem);
-static struct pci_bus *
+static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
-pci_do_find_bus(struct pci_bus* bus, unsigned char busnr)
 {
        struct pci_bus* child;
        struct list_head *tmp;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3554f3948814..5ec297d7a5b4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -36,8 +36,7 @@
 #define ROUND_UP(x, a)          (((x) + (a) - 1) & ~((a) - 1))
-static void __devinit
+static void pbus_assign_resources_sorted(struct pci_bus *bus)
-pbus_assign_resources_sorted(struct pci_bus *bus)
 {
        struct pci_dev *dev;
        struct resource *res;
@@ -220,8 +219,7 @@ pci_setup_bridge(struct pci_bus *bus)
 /* Check whether the bridge supports optional I/O and
   prefetchable memory ranges. If not, the respective
   base/limit registers must be read-only and read as 0. */
-static void __devinit
+static void pci_bridge_check_ranges(struct pci_bus *bus)
-pci_bridge_check_ranges(struct pci_bus *bus)
 {
        u16 io;
        u32 pmem;
@@ -259,8 +257,7 @@ pci_bridge_check_ranges(struct pci_bus *bus)
   bus resource of a given type. Note: we intentionally skip
   the bus resources which have already been assigned (that is,
   have non-NULL parent resource). */
-static struct resource * __devinit
+static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned long type)
-find_free_bus_resource(struct pci_bus *bus, unsigned long type)
 {
        int i;
        struct resource *r;
@@ -281,8 +278,7 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type)
   since these windows have 4K granularity and the IO ranges
   of non-bridge PCI devices are limited to 256 bytes.
   We must be careful with the ISA aliasing though. */
-static void __devinit
+static void pbus_size_io(struct pci_bus *bus)
-pbus_size_io(struct pci_bus *bus)
 {
        struct pci_dev *dev;
        struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
@@ -326,8 +322,7 @@ pbus_size_io(struct pci_bus *bus)
 /* Calculate the size of the bus and minimal alignment which
   guarantees that all child resources fit in this size. */
-static int __devinit
+static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
-pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
 {
        struct pci_dev *dev;
        unsigned long min_align, align, size;
@@ -447,8 +442,7 @@ pci_bus_size_cardbus(struct pci_bus *bus)
        }
 }
-void __devinit
+void pci_bus_size_bridges(struct pci_bus *bus)
-pci_bus_size_bridges(struct pci_bus *bus)
 {
        struct pci_dev *dev;
        unsigned long mask, prefmask;
@@ -498,8 +492,7 @@ pci_bus_size_bridges(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_size_bridges);
-void __devinit
+void pci_bus_assign_resources(struct pci_bus *bus)
-pci_bus_assign_resources(struct pci_bus *bus)
 {
        struct pci_bus *b;
        struct pci_dev *dev;
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index cb4ced3560e9..6dfd86167e39 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -101,8 +101,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
                new & ~PCI_REGION_FLAG_MASK);
 }
-int __devinit
+int pci_claim_resource(struct pci_dev *dev, int resource)
-pci_claim_resource(struct pci_dev *dev, int resource)
 {
        struct resource *res = &dev->resource[resource];
        struct resource *root = NULL;
@@ -212,8 +211,7 @@ EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);
 #endif
 /* Sort resources by alignment */
-void __devinit
+void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
-pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
 {
        int i;
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index ac004248324a..50cad3a59a6c 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -26,7 +26,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index ea5765c3bdc0..a2bb46526b56 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <asm/system.h>
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index eee590a51d8a..002643392d42 100644
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <asm/system.h>
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index d38b628be1ad..66aeb57dcc2d 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -32,7 +32,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 6f1a1780efce..f4b5e9742ab0 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 1d239f6c0103..cbbfbc9f3e0f 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -35,7 +35,6 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
-#include <linux/pci.h>
 #include <linux/isapnp.h>
 #include <linux/blkdev.h>
 #include <linux/mca.h>
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 8f43ff772f23..db6ab1a3b81e 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -24,7 +24,6 @@
 *
 */
-#include <linux/pci.h>
 #include <scsi/scsi_host.h>
 #include "aic94xx.h"
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 12497da5529d..03bfed61bffc 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -49,7 +49,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index dc70c180e115..e34442e405e8 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -22,7 +22,6 @@
 *
 */
-#include <linux/pci.h>
 #include <linux/scatterlist.h>
 #include "sas_internal.h"
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 89403b00e042..6335830df810 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -22,7 +22,6 @@
 #include <linux/kfifo.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
-#include <linux/pci.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 0aa3304f6b9b..7fc6e06ea7e1 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2088,7 +2088,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
 static inline int
 make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 {
-        *pdev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        *pdev = alloc_pci_dev();
        if( *pdev == NULL ) return -1;
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index a0cc05d21a6a..60d29440f316 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -55,7 +55,6 @@
 #include <linux/usb.h>
 #include <linux/types.h>
 #include <linux/ethtool.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 508479920705..7db9de681716 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -1,7 +1,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/fb.h>
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index ca93a75f2997..b7655c05da53 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/jazz.h>
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 233871655824..e64f8b5d0056 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -28,7 +28,6 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/nvram.h>
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 69f3b264a22e..c97709ecbad0 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -64,7 +64,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/pci.h>
 #include <asm/grfioctl.h>       /* for HP-UX compatibility */
 #include <asm/uaccess.h>
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 06fc19a61192..ad66f070acb8 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -51,7 +51,6 @@
 #include <linux/fb.h>
 #include <linux/selection.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/nvram.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>
diff --git a/include/asm-alpha/scatterlist.h b/include/asm-alpha/scatterlist.h
index 6afb8bd3aaf9..917365405e83 100644
--- a/include/asm-alpha/scatterlist.h
+++ b/include/asm-alpha/scatterlist.h
@@ -2,6 +2,7 @@
 #define _ALPHA_SCATTERLIST_H
 #include <asm/page.h>
+#include <asm/types.h>
  
 struct scatterlist {
        struct page *page;
diff --git a/include/asm-arm/arch-ixp4xx/dma.h b/include/asm-arm/arch-ixp4xx/dma.h
index 789f7f53c357..2c7f5327d80f 100644
--- a/include/asm-arm/arch-ixp4xx/dma.h
+++ b/include/asm-arm/arch-ixp4xx/dma.h
@@ -12,7 +12,6 @@
 #define __ASM_ARCH_DMA_H
 #include <linux/device.h>
-#include <linux/pci.h>
 #include <asm/page.h>
 #include <asm/sizes.h>
 #include <asm/hardware.h>
diff --git a/include/asm-avr32/scatterlist.h b/include/asm-avr32/scatterlist.h
index bfe7d753423c..c6d5ce3b3a25 100644
--- a/include/asm-avr32/scatterlist.h
+++ b/include/asm-avr32/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_AVR32_SCATTERLIST_H
 #define __ASM_AVR32_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    struct page         *page;
    unsigned int        offset;
diff --git a/include/asm-frv/scatterlist.h b/include/asm-frv/scatterlist.h
index fb38fd329a5f..8e827fa853f1 100644
--- a/include/asm-frv/scatterlist.h
+++ b/include/asm-frv/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_SCATTERLIST_H
 #define _ASM_SCATTERLIST_H
+#include <asm/types.h>
 /*
 * Drivers must set either ->address or (preferred) ->page and ->offset
 * to indicate where data must be transferred to/from.
diff --git a/include/asm-h8300/scatterlist.h b/include/asm-h8300/scatterlist.h
index 7627f0cd1a2f..985fdf54eaca 100644
--- a/include/asm-h8300/scatterlist.h
+++ b/include/asm-h8300/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _H8300_SCATTERLIST_H
 #define _H8300_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
        struct page     *page;
        unsigned int    offset;
diff --git a/include/asm-i386/scatterlist.h b/include/asm-i386/scatterlist.h
index 55d6c953a76e..d7e45a8f1aae 100644
--- a/include/asm-i386/scatterlist.h
+++ b/include/asm-i386/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _I386_SCATTERLIST_H
 #define _I386_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    struct page         *page;
    unsigned int        offset;
diff --git a/include/asm-ia64/scatterlist.h b/include/asm-ia64/scatterlist.h
index 9dbea8844d5e..a452ea24205a 100644
--- a/include/asm-ia64/scatterlist.h
+++ b/include/asm-ia64/scatterlist.h
@@ -6,6 +6,8 @@
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
+#include <asm/types.h>
 struct scatterlist {
        struct page *page;
        unsigned int offset;
diff --git a/include/asm-m32r/scatterlist.h b/include/asm-m32r/scatterlist.h
index c2de96cb69ed..352415ff5eb9 100644
--- a/include/asm-m32r/scatterlist.h
+++ b/include/asm-m32r/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_M32R_SCATTERLIST_H
 #define _ASM_M32R_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    char *  address;    /* Location data is to be transferred to, NULL for
                         * highmem page */
diff --git a/include/asm-m68knommu/scatterlist.h b/include/asm-m68knommu/scatterlist.h
index 2085d6ff8782..4da79d3d3f34 100644
--- a/include/asm-m68knommu/scatterlist.h
+++ b/include/asm-m68knommu/scatterlist.h
@@ -2,6 +2,7 @@
 #define _M68KNOMMU_SCATTERLIST_H
 #include <linux/mm.h>
+#include <asm/types.h>
 struct scatterlist {
        struct page     *page;
diff --git a/include/asm-mips/scatterlist.h b/include/asm-mips/scatterlist.h
index 22634706e9d5..7af104c95b20 100644
--- a/include/asm-mips/scatterlist.h
+++ b/include/asm-mips/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_SCATTERLIST_H
 #define __ASM_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
        struct page *   page;
        unsigned int    offset;
diff --git a/include/asm-parisc/scatterlist.h b/include/asm-parisc/scatterlist.h
index 236c1d0fba33..e7211c748446 100644
--- a/include/asm-parisc/scatterlist.h
+++ b/include/asm-parisc/scatterlist.h
@@ -2,6 +2,7 @@
 #define _ASM_PARISC_SCATTERLIST_H
 #include <asm/page.h>
+#include <asm/types.h>
 struct scatterlist {
        struct page *page;
diff --git a/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h
index d19e7cd3b023..b9ae53c38365 100644
--- a/include/asm-sh/scatterlist.h
+++ b/include/asm-sh/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_SH_SCATTERLIST_H
 #define __ASM_SH_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    struct page * page; /* Location for highmem page, if any */
    unsigned int offset;/* for highmem, page offset */
diff --git a/include/asm-sh64/scatterlist.h b/include/asm-sh64/scatterlist.h
index 5d8fa32d2e9d..1c723f2d7a95 100644
--- a/include/asm-sh64/scatterlist.h
+++ b/include/asm-sh64/scatterlist.h
@@ -11,6 +11,8 @@
 #ifndef __ASM_SH64_SCATTERLIST_H
 #define __ASM_SH64_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    struct page * page; /* Location for highmem page, if any */
    unsigned int offset;/* for highmem, page offset */
diff --git a/include/asm-sparc64/scatterlist.h b/include/asm-sparc64/scatterlist.h
index ec4f3c63fe98..048fdb40e81d 100644
--- a/include/asm-sparc64/scatterlist.h
+++ b/include/asm-sparc64/scatterlist.h
@@ -3,6 +3,7 @@
 #define _SPARC64_SCATTERLIST_H
 #include <asm/page.h>
+#include <asm/types.h>
 struct scatterlist {
        struct page     *page;
diff --git a/include/asm-v850/scatterlist.h b/include/asm-v850/scatterlist.h
index af1cba69a526..56f402920db9 100644
--- a/include/asm-v850/scatterlist.h
+++ b/include/asm-v850/scatterlist.h
@@ -14,6 +14,8 @@
 #ifndef __V850_SCATTERLIST_H__
 #define __V850_SCATTERLIST_H__
+#include <asm/types.h>
 struct scatterlist {
        struct page     *page;
        unsigned        offset;
diff --git a/include/asm-x86_64/scatterlist.h b/include/asm-x86_64/scatterlist.h
index 49d89f8129cd..eaf7ada27e14 100644
--- a/include/asm-x86_64/scatterlist.h
+++ b/include/asm-x86_64/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _X8664_SCATTERLIST_H
 #define _X8664_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
    struct page         *page;
    unsigned int        offset;
diff --git a/include/asm-xtensa/scatterlist.h b/include/asm-xtensa/scatterlist.h
index 38a2b9acd658..ca337a294290 100644
--- a/include/asm-xtensa/scatterlist.h
+++ b/include/asm-xtensa/scatterlist.h
@@ -11,6 +11,8 @@
 #ifndef _XTENSA_SCATTERLIST_H
 #define _XTENSA_SCATTERLIST_H
+#include <asm/types.h>
 struct scatterlist {
        struct page     *page;
        unsigned int    offset;
diff --git a/include/linux/device.h b/include/linux/device.h
index a0cd2ced31a9..ff83b61d283d 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -80,7 +80,6 @@ struct bus_type {
        int (*resume)(struct device * dev);
        unsigned int drivers_autoprobe:1;
-        unsigned int multithread_probe:1;
 };
 extern int __must_check bus_register(struct bus_type * bus);
diff --git a/include/linux/msi.h b/include/linux/msi.h
index e38fe6822cb4..94bb46d82efd 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -1,6 +1,8 @@
 #ifndef LINUX_MSI_H
 #define LINUX_MSI_H
+#include <linux/list.h>
 struct msi_msg {
        u32     address_lo;     /* low 32 bits of msi message address */
        u32     address_hi;     /* high 32 bits of msi message address */
@@ -24,10 +26,8 @@ struct msi_desc {
                unsigned default_irq;   /* default pre-assigned irq       */
        }msi_attrib;
-        struct {
+        unsigned int irq;
-                __u16   head;
+        struct list_head list;
-                __u16   tail;
-        }link;
        void __iomem *mask_base;
        struct pci_dev *dev;
@@ -41,6 +41,9 @@ struct msi_desc {
 */
 int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
 void arch_teardown_msi_irq(unsigned int irq);
+extern int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
+extern void arch_teardown_msi_irqs(struct pci_dev *dev);
+extern int arch_msi_check_device(struct pci_dev* dev, int nvec, int type);
 #endif /* LINUX_MSI_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 972491089ac9..fbf3766dac1e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -96,6 +96,19 @@ enum pci_channel_state {
        pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
 };
+typedef unsigned int __bitwise pcie_reset_state_t;
+enum pcie_reset_state {
+        /* Reset is NOT asserted (Use to deassert reset) */
+        pcie_deassert_reset = (__force pcie_reset_state_t) 1,
+        /* Use #PERST to reset PCI-E device */
+        pcie_warm_reset = (__force pcie_reset_state_t) 2,
+        /* Use PCI-E Hot Reset to reset device */
+        pcie_hot_reset = (__force pcie_reset_state_t) 3
+};
 typedef unsigned short __bitwise pci_bus_flags_t;
 enum pci_bus_flags {
        PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
@@ -176,10 +189,12 @@ struct pci_dev {
        int rom_attr_enabled;           /* has display of the rom attribute been enabled? */
        struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
 #ifdef CONFIG_PCI_MSI
-        unsigned int first_msi_irq;
+        struct list_head msi_list;
 #endif
 };
+extern struct pci_dev *alloc_pci_dev(void);
 #define pci_dev_g(n) list_entry(n, struct pci_dev, global_list)
 #define pci_dev_b(n) list_entry(n, struct pci_dev, bus_list)
 #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
@@ -392,12 +407,6 @@ struct pci_driver {
        .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
        .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
-/*
- * pci_module_init is obsolete, this stays here till we fix up all usages of it
- * in the tree.
- */
-#define pci_module_init pci_register_driver
 /**
 * PCI_VDEVICE - macro used to describe a specific pci device in short form
 * @vend: the vendor name
@@ -532,6 +541,7 @@ static inline int pci_is_managed(struct pci_dev *pdev)
 void pci_disable_device(struct pci_dev *dev);
 void pci_set_master(struct pci_dev *dev);
+int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state);
 #define HAVE_PCI_SET_MWI
 int __must_check pci_set_mwi(struct pci_dev *dev);
 void pci_clear_mwi(struct pci_dev *dev);
@@ -730,6 +740,9 @@ static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state) {
 static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; }
 static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; }
+static inline int pci_request_regions(struct pci_dev *dev, const char *res_name) { return -EIO; }
+static inline void pci_release_regions(struct pci_dev *dev) { }
 #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
 static inline void pci_block_user_cfg_access(struct pci_dev *dev) { }
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index 585d28e960dd..739fa4d0e539 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -39,8 +39,6 @@
 #if !defined( IB_MAD_H )
 #define IB_MAD_H
-#include <linux/pci.h>
 #include <rdma/ib_verbs.h>
 /* Management base version */
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 0133f4f9e9f0..615ce97c6cfd 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -11,6 +11,7 @@
 */
 #include <linux/irq.h>
+#include <linux/msi.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
@@ -185,6 +186,8 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry)
        desc = irq_desc + irq;
        spin_lock_irqsave(&desc->lock, flags);
        desc->msi_desc = entry;
+        if (entry)
+                entry->irq = irq;
        spin_unlock_irqrestore(&desc->lock, flags);
        return 0;
 }
diff --git a/sound/core/init.c b/sound/core/init.c
index 4a431e3ea3a2..f2fe35737186 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 #include <sound/core.h>
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index a339f0c0d512..23018a7c063a 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -47,7 +47,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/poll.h>
-#include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index dcd8d6d2f56f..a9c23b2502ad 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -44,6 +44,7 @@
 #include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/device.h>
 /*
 * This ought to be moved into include/asm/dma.h
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index b913a1fb8c21..9c3a9c8d1dc2 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -62,7 +62,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -71,6 +70,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
 #include <sound/tlv.h>
+#include <asm/io.h>
 #include "ca0106.h"
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index 75ca421eb3a1..ae80f51d8c4f 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -64,7 +64,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -73,6 +72,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
 #include <sound/asoundef.h>
+#include <asm/io.h>
 #include "ca0106.h"
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 89c402770a1d..336e77e2600c 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 343f51d5311b..57e357de1500 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -24,7 +24,6 @@
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 1589d2f2917f..1e5ff0cd3709 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 17df4d0fe135..e313e685f161 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index 7333f275decd..831469d3a923 100644
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -25,7 +25,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index ed5e45e35963..6fcda9bcf0cf 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 4c839b031729..2b11ac8689b9 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -35,7 +35,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"