PCI: make pci_bus a struct device

This moves the pci_bus class device to be a real struct device and at
the same time, place it in the device tree in the correct location.

Note, the old "bridge" symlink is now gone, but this was a non-standard
link and no userspace program used it.  If you need to determine the
device that the bus is on, follow the standard device symlink, or walk
up the device tree.


Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

5 files changed, 44 insertions, 51 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 863340a7b77f..ef5a6a245f5f 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -108,6 +108,7 @@ int pci_bus_add_device(struct pci_dev *dev)
 void pci_bus_add_devices(struct pci_bus *bus)
 {
         struct pci_dev *dev;
+        struct pci_bus *child_bus;
         int retval;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -138,11 +139,19 @@ void pci_bus_add_devices(struct pci_bus *bus)
                                up_write(&pci_bus_sem);
                         }
                         pci_bus_add_devices(dev->subordinate);
-                        retval = sysfs_create_link(&dev->subordinate->class_dev.kobj,
-                                                   &dev->dev.kobj, "bridge");
+
+                        /* register the bus with sysfs as the parent is now
+                         * properly registered. */
+                        child_bus = dev->subordinate;
+                        child_bus->dev.parent = child_bus->bridge;
+                        retval = device_register(&child_bus->dev);
+                        if (!retval)
+                                retval = device_create_file(&child_bus->dev,
+                                                        &dev_attr_cpuaffinity);
                         if (retval)
-                                dev_err(&dev->dev, "Error creating sysfs "
-                                        "bridge symlink, continuing...\n");
+                                dev_err(&dev->dev, "Error registering pci_bus"
+                                        " device bridge symlink,"
+                                        " continuing...\n");
                 }
         }
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d05c1b252386..abf4203304e4 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -359,7 +359,7 @@ pci_read_legacy_io(struct kobject *kobj, struct bin_attribute *bin_attr,
                    char *buf, loff_t off, size_t count)
 {
         struct pci_bus *bus = to_pci_bus(container_of(kobj,
-                                                      struct class_device,
+                                                      struct device,
                                                       kobj));
 
         /* Only support 1, 2 or 4 byte accesses */
@@ -384,7 +384,7 @@ pci_write_legacy_io(struct kobject *kobj, struct bin_attribute *bin_attr,
                     char *buf, loff_t off, size_t count)
 {
         struct pci_bus *bus = to_pci_bus(container_of(kobj,
-                                                      struct class_device,
+                                                      struct device,
                                                       kobj));
         /* Only support 1, 2 or 4 byte accesses */
         if (count != 1 && count != 2 && count != 4)
@@ -408,7 +408,7 @@ pci_mmap_legacy_mem(struct kobject *kobj, struct bin_attribute *attr,
                     struct vm_area_struct *vma)
 {
         struct pci_bus *bus = to_pci_bus(container_of(kobj,
-                                                      struct class_device,
+                                                      struct device,
                                                       kobj));
 
         return pci_mmap_legacy_page_range(bus, vma);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 79887efbd986..eabeb1f2ec99 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -64,7 +64,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
 }
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
-extern struct class_device_attribute class_device_attr_cpuaffinity;
+extern struct device_attribute dev_attr_cpuaffinity;
 
 /**
  * pci_match_one_device - Tell if a PCI device structure has a matching
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 9b4673df27e7..8b505bd925aa 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -54,7 +54,7 @@ static void pci_create_legacy_files(struct pci_bus *b)
                 b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
                 b->legacy_io->read = pci_read_legacy_io;
                 b->legacy_io->write = pci_write_legacy_io;
-                class_device_create_bin_file(&b->class_dev, b->legacy_io);
+                device_create_bin_file(&b->dev, b->legacy_io);
 
                 /* Allocated above after the legacy_io struct */
                 b->legacy_mem = b->legacy_io + 1;
@@ -62,15 +62,15 @@ static void pci_create_legacy_files(struct pci_bus *b)
                 b->legacy_mem->size = 1024*1024;
                 b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
                 b->legacy_mem->mmap = pci_mmap_legacy_mem;
-                class_device_create_bin_file(&b->class_dev, b->legacy_mem);
+                device_create_bin_file(&b->dev, b->legacy_mem);
         }
 }
 
 void pci_remove_legacy_files(struct pci_bus *b)
 {
         if (b->legacy_io) {
-                class_device_remove_bin_file(&b->class_dev, b->legacy_io);
-                class_device_remove_bin_file(&b->class_dev, b->legacy_mem);
+                device_remove_bin_file(&b->dev, b->legacy_io);
+                device_remove_bin_file(&b->dev, b->legacy_mem);
                 kfree(b->legacy_io); /* both are allocated here */
         }
 }
@@ -82,26 +82,27 @@ 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,
+static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
+                                        struct device_attribute *attr,
                                         char *buf)
 {
         int ret;
         cpumask_t cpumask;
 
-        cpumask = pcibus_to_cpumask(to_pci_bus(class_dev));
+        cpumask = pcibus_to_cpumask(to_pci_bus(dev));
         ret = cpumask_scnprintf(buf, PAGE_SIZE, cpumask);
         if (ret < PAGE_SIZE)
                 buf[ret++] = '\n';
         return ret;
 }
-CLASS_DEVICE_ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpuaffinity, NULL);
+DEVICE_ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpuaffinity, NULL);
 
 /*
  * PCI Bus Class
  */
-static void release_pcibus_dev(struct class_device *class_dev)
+static void release_pcibus_dev(struct device *dev)
 {
-        struct pci_bus *pci_bus = to_pci_bus(class_dev);
+        struct pci_bus *pci_bus = to_pci_bus(dev);
 
         if (pci_bus->bridge)
                 put_device(pci_bus->bridge);
@@ -110,7 +111,7 @@ static void release_pcibus_dev(struct class_device *class_dev)
 
 static struct class pcibus_class = {
         .name           = "pci_bus",
-        .release        = &release_pcibus_dev,
+        .dev_release    = &release_pcibus_dev,
 };
 
 static int __init pcibus_class_init(void)
@@ -393,7 +394,6 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr)
 {
         struct pci_bus *child;
         int i;
-        int retval;
 
         /*
          * Allocate a new bus, and inherit stuff from the parent..
@@ -409,15 +409,12 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr)
         child->bus_flags = parent->bus_flags;
         child->bridge = get_device(&bridge->dev);
 
-        child->class_dev.class = &pcibus_class;
-        sprintf(child->class_dev.class_id, "%04x:%02x", pci_domain_nr(child), busnr);
-        retval = class_device_register(&child->class_dev);
-        if (retval)
-                goto error_register;
-        retval = class_device_create_file(&child->class_dev,
-                                          &class_device_attr_cpuaffinity);
-        if (retval)
-                goto error_file_create;
+        /* initialize some portions of the bus device, but don't register it
+         * now as the parent is not properly set up yet.  This device will get
+         * registered later in pci_bus_add_devices()
+         */
+        child->dev.class = &pcibus_class;
+        sprintf(child->dev.bus_id, "%04x:%02x", pci_domain_nr(child), busnr);
 
         /*
          * Set up the primary, secondary and subordinate
@@ -435,12 +432,6 @@ pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr)
         bridge->subordinate = child;
 
         return child;
-
-error_file_create:
-        class_device_unregister(&child->class_dev);
-error_register:
-        kfree(child);
-        return NULL;
 }
 
 struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
@@ -1107,32 +1098,27 @@ struct pci_bus * pci_create_bus(struct device *parent,
                 goto dev_reg_err;
         b->bridge = get_device(dev);
 
-        b->class_dev.class = &pcibus_class;
-        sprintf(b->class_dev.class_id, "%04x:%02x", pci_domain_nr(b), bus);
-        error = class_device_register(&b->class_dev);
+        b->dev.class = &pcibus_class;
+        b->dev.parent = b->bridge;
+        sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus);
+        error = device_register(&b->dev);
         if (error)
                 goto class_dev_reg_err;
-        error = class_device_create_file(&b->class_dev, &class_device_attr_cpuaffinity);
+        error = device_create_file(&b->dev, &dev_attr_cpuaffinity);
         if (error)
-                goto class_dev_create_file_err;
+                goto dev_create_file_err;
 
         /* Create legacy_io and legacy_mem files for this bus */
         pci_create_legacy_files(b);
 
-        error = sysfs_create_link(&b->class_dev.kobj, &b->bridge->kobj, "bridge");
-        if (error)
-                goto sys_create_link_err;
-
         b->number = b->secondary = bus;
         b->resource[0] = &ioport_resource;
         b->resource[1] = &iomem_resource;
 
         return b;
 
-sys_create_link_err:
-        class_device_remove_file(&b->class_dev, &class_device_attr_cpuaffinity);
-class_dev_create_file_err:
-        class_device_unregister(&b->class_dev);
+dev_create_file_err:
+        device_unregister(&b->dev);
 class_dev_reg_err:
         device_unregister(dev);
 dev_reg_err:
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 05c9ad2a7f8b..ec4a82ba29a8 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -78,10 +78,8 @@ void pci_remove_bus(struct pci_bus *pci_bus)
         list_del(&pci_bus->node);
         up_write(&pci_bus_sem);
         pci_remove_legacy_files(pci_bus);
-        class_device_remove_file(&pci_bus->class_dev,
-                &class_device_attr_cpuaffinity);
-        sysfs_remove_link(&pci_bus->class_dev.kobj, "bridge");
-        class_device_unregister(&pci_bus->class_dev);
+        device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
+        device_unregister(&pci_bus->dev);
 }
 EXPORT_SYMBOL(pci_remove_bus);