1 files changed, 7 insertions, 46 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 12625d90f8b5..bafb3c3d4a89 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -43,43 +43,6 @@ int no_pci_devices(void)
 EXPORT_SYMBOL(no_pci_devices);
 
 /*
- * PCI Bus Class Devices
- */
-static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
-                                        int type,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        int ret;
-        const struct cpumask *cpumask;
-
-        cpumask = cpumask_of_pcibus(to_pci_bus(dev));
-        ret = type?
-                cpulist_scnprintf(buf, PAGE_SIZE-2, cpumask) :
-                cpumask_scnprintf(buf, PAGE_SIZE-2, cpumask);
-        buf[ret++] = '\n';
-        buf[ret] = '\0';
-        return ret;
-}
-
-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
-}
-
-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        return pci_bus_show_cpuaffinity(dev, 1, attr, buf);
-}
-
-DEVICE_ATTR(cpuaffinity,     S_IRUGO, pci_bus_show_cpumaskaffinity, NULL);
-DEVICE_ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL);
-
-/*
  * PCI Bus Class
  */
 static void release_pcibus_dev(struct device *dev)
@@ -95,6 +58,7 @@ static void release_pcibus_dev(struct device *dev)
 static struct class pcibus_class = {
         .name           = "pci_bus",
         .dev_release    = &release_pcibus_dev,
+        .dev_attrs      = pcibus_dev_attrs,
 };
 
 static int __init pcibus_class_init(void)
@@ -204,7 +168,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN;
                 if (type == pci_bar_io) {
                         l &= PCI_BASE_ADDRESS_IO_MASK;
-                        mask = PCI_BASE_ADDRESS_IO_MASK & IO_SPACE_LIMIT;
+                        mask = PCI_BASE_ADDRESS_IO_MASK & (u32) IO_SPACE_LIMIT;
                 } else {
                         l &= PCI_BASE_ADDRESS_MEM_MASK;
                         mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
@@ -764,6 +728,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
                 if (pci_find_bus(pci_domain_nr(bus), max+1))
                         goto out;
                 child = pci_add_new_bus(bus, dev, ++max);
+                if (!child)
+                        goto out;
                 buses = (buses & 0xff000000)
                       | ((unsigned int)(child->primary)     <<  0)
                       | ((unsigned int)(child->secondary)   <<  8)
@@ -777,7 +743,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
                         buses &= ~0xff000000;
                         buses |= CARDBUS_LATENCY_TIMER << 24;
                 }
-                        
+
                 /*
                  * We need to blast all three values with a single write.
                  */
@@ -961,8 +927,8 @@ int pci_setup_device(struct pci_dev *dev)
         dev->class = class;
         class >>= 8;
 
-        dev_dbg(&dev->dev, "found [%04x:%04x] class %06x header type %02x\n",
-                 dev->vendor, dev->device, class, dev->hdr_type);
+        dev_printk(KERN_DEBUG, &dev->dev, "[%04x:%04x] type %d class %#08x\n",
+                   dev->vendor, dev->device, dev->hdr_type, class);
 
         /* need to have dev->class ready */
         dev->cfg_size = pci_cfg_space_size(dev);
@@ -1453,9 +1419,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
         error = device_register(&b->dev);
         if (error)
                 goto class_dev_reg_err;
-        error = device_create_file(&b->dev, &dev_attr_cpuaffinity);
-        if (error)
-                goto dev_create_file_err;
 
         /* Create legacy_io and legacy_mem files for this bus */
         pci_create_legacy_files(b);
@@ -1466,8 +1429,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
 
         return b;
 
-dev_create_file_err:
-        device_unregister(&b->dev);
 class_dev_reg_err:
         device_unregister(dev);
 dev_reg_err: