10 files changed, 95 insertions, 73 deletions

diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
index b844bc972324..10444988a10b 100644
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
@@ -20,46 +20,35 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
 
         scratch = buffer;
 
-        /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length, "PCI_CLASS=%04X",
-                            pdev->class);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
+
+        if (add_hotplug_env_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "PCI_CLASS=%04X", pdev->class))
                 return -ENOMEM;
-        ++length;
-        scratch += length;
 
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length, "PCI_ID=%04X:%04X",
-                            pdev->vendor, pdev->device);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
+        if (add_hotplug_env_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
                 return -ENOMEM;
-        ++length;
-        scratch += length;
 
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length,
-                            "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
-                            pdev->subsystem_device);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
+        if (add_hotplug_env_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
+                                pdev->subsystem_device))
                 return -ENOMEM;
-        ++length;
-        scratch += length;
 
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length, "PCI_SLOT_NAME=%s",
-                            pci_name(pdev));
-        if ((buffer_size - length <= 0) || (i >= num_envp))
+        if (add_hotplug_env_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "PCI_SLOT_NAME=%s", pci_name(pdev)))
                 return -ENOMEM;
 
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length,
-                            "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
-                            pdev->vendor, pdev->device,
-                            pdev->subsystem_vendor, pdev->subsystem_device,
-                            (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
-                            (u8)(pdev->class));
-        if ((buffer_size - length <= 0) || (i >= num_envp))
+        if (add_hotplug_env_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
+                                pdev->vendor, pdev->device,
+                                pdev->subsystem_vendor, pdev->subsystem_device,
+                                (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
+                                (u8)(pdev->class)))
                 return -ENOMEM;
 
         envp[i] = NULL;
diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c
index 305b47ec2f2c..1406db35b089 100644
--- a/drivers/pci/hotplug/pciehprm_acpi.c
+++ b/drivers/pci/hotplug/pciehprm_acpi.c
@@ -1696,15 +1696,15 @@ void pciehprm_enable_card(
         pci_bus->number = func->bus;
         devfn = PCI_DEVFN(func->device, func->function);
 
-        rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &command);
+        rc = pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &cmd);
 
         if (card_type == PCI_HEADER_TYPE_BRIDGE) {
-                rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcommand);
+                rc = pci_bus_read_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, &bcmd);
         }
 
-        cmd = command  = command | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
+        command  = cmd | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
                 | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
-        bcmd = bcommand  = bcommand | PCI_BRIDGE_CTL_NO_ISA;
+        bcommand  = bcmd | PCI_BRIDGE_CTL_NO_ISA;
 
         ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
         if (ab) {
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 4ada15111af0..ad1017da8656 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -134,7 +134,8 @@ static void rpadlpar_claim_one_bus(struct pci_bus *b)
 static int pci_add_secondary_bus(struct device_node *dn,
                 struct pci_dev *bridge_dev)
 {
-        struct pci_controller *hose = dn->phb;
+        struct pci_dn *pdn = dn->data;
+        struct pci_controller *hose = pdn->phb;
         struct pci_bus *child;
         u8 sec_busno;
 
@@ -159,7 +160,7 @@ static int pci_add_secondary_bus(struct device_node *dn,
         if (hose->last_busno < child->number)
                 hose->last_busno = child->number;
 
-        dn->bussubno = child->number;
+        pdn->bussubno = child->number;
 
         /* ioremap() for child bus, which may or may not succeed */
         remap_bus_range(child);
@@ -183,11 +184,12 @@ static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
 
 static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
 {
-        struct pci_controller *hose = dn->phb;
+        struct pci_dn *pdn = dn->data;
+        struct pci_controller *hose = pdn->phb;
         struct pci_dev *dev = NULL;
 
         /* Scan phb bus for EADS device, adding new one to bus->devices */
-        if (!pci_scan_single_device(hose->bus, dn->devfn)) {
+        if (!pci_scan_single_device(hose->bus, pdn->devfn)) {
                 printk(KERN_ERR "%s: found no device on bus\n", __FUNCTION__);
                 return NULL;
         }
@@ -269,6 +271,7 @@ static int dlpar_remove_root_bus(struct pci_controller *phb)
 static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
 {
         struct slot *slot;
+        struct pci_dn *pdn;
         int rc = 0;
 
         if (!rpaphp_find_pci_bus(dn))
@@ -285,12 +288,13 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
                 }
         }
 
-        BUG_ON(!dn->phb);
-        rc = dlpar_remove_root_bus(dn->phb);
+        pdn = dn->data;
+        BUG_ON(!pdn || !pdn->phb);
+        rc = dlpar_remove_root_bus(pdn->phb);
         if (rc < 0)
                 return rc;
 
-        dn->phb = NULL;
+        pdn->phb = NULL;
 
         return 0;
 }
@@ -299,7 +303,7 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn)
 {
         struct pci_controller *phb;
 
-        if (dn->phb) {
+        if (PCI_DN(dn)->phb) {
                 /* PHB already exists */
                 return -EINVAL;
         }
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 17a0279ebcb9..49e4d10a6488 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -51,10 +51,12 @@ static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
 
 struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)
 {
-        if (!dn->phb || !dn->phb->bus)
+        struct pci_dn *pdn = dn->data;
+
+        if (!pdn  || !pdn->phb || !pdn->phb->bus)
                 return NULL;
 
-        return find_bus_among_children(dn->phb->bus, dn);
+        return find_bus_among_children(pdn->phb->bus, dn);
 }
 EXPORT_SYMBOL_GPL(rpaphp_find_pci_bus);
 
@@ -229,7 +231,7 @@ rpaphp_pci_config_slot(struct pci_bus *bus)
         if (!dn || !dn->child)
                 return NULL;
 
-        slotno = PCI_SLOT(dn->child->devfn);
+        slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
 
         /* pci_scan_slot should find all children */
         num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index cc9d65388e62..56a3b397efee 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -44,10 +44,14 @@ pci_config_attr(subsystem_device, "0x%04x\n");
 pci_config_attr(class, "0x%06x\n");
 pci_config_attr(irq, "%u\n");
 
-static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t local_cpus_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {               
-        cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
-        int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
+        cpumask_t mask;
+        int len;
+
+        mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
+        len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
         strcat(buf,"\n"); 
         return 1+len;
 }
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ccff633a3948..992db89adce7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -819,7 +819,7 @@ pci_intx(struct pci_dev *pdev, int enable)
         }
 
         if (new != pci_command) {
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
+                pci_write_config_word(pdev, PCI_COMMAND, new);
         }
 }
 
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index d00168b1f662..d3f3dd42240d 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -29,7 +29,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
 #endif
 
 /* Functions for PCI Hotplug drivers to use */
-extern struct pci_bus * pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr);
 extern unsigned int pci_do_scan_bus(struct pci_bus *bus);
 extern int pci_remove_device_safe(struct pci_dev *dev);
 extern unsigned char pci_max_busnr(void);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b9c9b03919d4..26a55d08b506 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -72,11 +72,13 @@ void pci_remove_legacy_files(struct pci_bus *bus) { return; }
 /*
  * PCI Bus Class Devices
  */
-static ssize_t pci_bus_show_cpuaffinity(struct class_device *class_dev, char *buf)
+static ssize_t pci_bus_show_cpuaffinity(struct class_device *class_dev,
+                                        char *buf)
 {
-        cpumask_t cpumask = pcibus_to_cpumask(to_pci_bus(class_dev));
         int ret;
+        cpumask_t cpumask;
 
+        cpumask = pcibus_to_cpumask(to_pci_bus(class_dev));
         ret = cpumask_scnprintf(buf, PAGE_SIZE, cpumask);
         if (ret < PAGE_SIZE)
                 buf[ret++] = '\n';
@@ -753,27 +755,19 @@ pci_scan_device(struct pci_bus *bus, int devfn)
                 kfree(dev);
                 return NULL;
         }
-        device_initialize(&dev->dev);
-        dev->dev.release = pci_release_dev;
-        pci_dev_get(dev);
-
-        dev->dev.dma_mask = &dev->dma_mask;
-        dev->dev.coherent_dma_mask = 0xffffffffull;
 
         return dev;
 }
 
-struct pci_dev * __devinit
-pci_scan_single_device(struct pci_bus *bus, int devfn)
+void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
-        struct pci_dev *dev;
+        device_initialize(&dev->dev);
+        dev->dev.release = pci_release_dev;
+        pci_dev_get(dev);
 
-        dev = pci_scan_device(bus, devfn);
-        pci_scan_msi_device(dev);
+        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.coherent_dma_mask = 0xffffffffull;
 
-        if (!dev)
-                return NULL;
-        
         /* Fix up broken headers */
         pci_fixup_device(pci_fixup_header, dev);
 
@@ -785,6 +779,19 @@ pci_scan_single_device(struct pci_bus *bus, int devfn)
         spin_lock(&pci_bus_lock);
         list_add_tail(&dev->bus_list, &bus->devices);
         spin_unlock(&pci_bus_lock);
+}
+
+struct pci_dev * __devinit
+pci_scan_single_device(struct pci_bus *bus, int devfn)
+{
+        struct pci_dev *dev;
+
+        dev = pci_scan_device(bus, devfn);
+        if (!dev)
+                return NULL;
+
+        pci_device_add(dev, bus);
+        pci_scan_msi_device(dev);
 
         return dev;
 }
@@ -881,7 +888,8 @@ unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
         return max;
 }
 
-struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata)
+struct pci_bus * __devinit pci_create_bus(struct device *parent,
+                int bus, struct pci_ops *ops, void *sysdata)
 {
         int error;
         struct pci_bus *b;
@@ -938,8 +946,6 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus,
         b->resource[0] = &ioport_resource;
         b->resource[1] = &iomem_resource;
 
-        b->subordinate = pci_scan_child_bus(b);
-
         return b;
 
 sys_create_link_err:
@@ -957,6 +963,18 @@ err_out:
         kfree(b);
         return NULL;
 }
+EXPORT_SYMBOL_GPL(pci_create_bus);
+
+struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
+                int bus, struct pci_ops *ops, void *sysdata)
+{
+        struct pci_bus *b;
+
+        b = pci_create_bus(parent, bus, ops, sysdata);
+        if (b)
+                b->subordinate = pci_scan_child_bus(b);
+        return b;
+}
 EXPORT_SYMBOL(pci_scan_bus_parented);
 
 #ifdef CONFIG_HOTPLUG
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 4f0c1bd3674a..11ca44387cb0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -876,6 +876,12 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                        case 0xC00C: /* Samsung P35 notebook */
                                asus_hides_smbus = 1;
                        }
+        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ)) {
+                if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
+                        switch(dev->subsystem_device) {
+                        case 0x0058: /* Compaq Evo N620c */
+                                asus_hides_smbus = 1;
+                        }
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845_HB,   asus_hides_smbus_hostbridge );
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6b0e6464eb39..657be948baf7 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -77,8 +77,7 @@ pbus_assign_resources_sorted(struct pci_bus *bus)
         }
 }
 
-static void __devinit
-pci_setup_cardbus(struct pci_bus *bus)
+void pci_setup_cardbus(struct pci_bus *bus)
 {
         struct pci_dev *bridge = bus->self;
         struct pci_bus_region region;
@@ -130,6 +129,7 @@ pci_setup_cardbus(struct pci_bus *bus)
                                         region.end);
         }
 }
+EXPORT_SYMBOL(pci_setup_cardbus);
 
 /* Initialize bridges with base/limit values we have collected.
    PCI-to-PCI Bridge Architecture Specification rev. 1.1 (1998)