1 files changed, 19 insertions, 9 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 76656acd00d4..050d86d0b872 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -362,8 +362,7 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)
  *      @dev:   device being added
  *
  *      - Add the device to its bus's list of devices.
- *      - Try to attach to driver.
- *      - Create link to device's physical location.
+ *      - Create link to device's bus.
  */
 int bus_add_device(struct device * dev)
 {
@@ -372,11 +371,10 @@ int bus_add_device(struct device * dev)
 
         if (bus) {
                 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
-                device_attach(dev);
-                klist_add_tail(&dev->knode_bus, &bus->klist_devices);
                 error = device_add_attrs(bus, dev);
                 if (!error) {
                         sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
+                        sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "subsystem");
                         sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
                 }
         }
@@ -384,6 +382,22 @@ int bus_add_device(struct device * dev)
 }
 
 /**
+ *      bus_attach_device - add device to bus
+ *      @dev:   device tried to attach to a driver
+ *
+ *      - Try to attach to driver.
+ */
+void bus_attach_device(struct device * dev)
+{
+        struct bus_type * bus = dev->bus;
+
+        if (bus) {
+                device_attach(dev);
+                klist_add_tail(&dev->knode_bus, &bus->klist_devices);
+        }
+}
+
+/**
  *      bus_remove_device - remove device from bus
  *      @dev:   device to be removed
  *
@@ -395,6 +409,7 @@ int bus_add_device(struct device * dev)
 void bus_remove_device(struct device * dev)
 {
         if (dev->bus) {
+                sysfs_remove_link(&dev->kobj, "subsystem");
                 sysfs_remove_link(&dev->kobj, "bus");
                 sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
                 device_remove_attrs(dev->bus, dev);
@@ -732,14 +747,9 @@ EXPORT_SYMBOL_GPL(bus_for_each_dev);
 EXPORT_SYMBOL_GPL(bus_find_device);
 EXPORT_SYMBOL_GPL(bus_for_each_drv);
 
-EXPORT_SYMBOL_GPL(bus_add_device);
-EXPORT_SYMBOL_GPL(bus_remove_device);
 EXPORT_SYMBOL_GPL(bus_register);
 EXPORT_SYMBOL_GPL(bus_unregister);
 EXPORT_SYMBOL_GPL(bus_rescan_devices);
-EXPORT_SYMBOL_GPL(get_bus);
-EXPORT_SYMBOL_GPL(put_bus);
-EXPORT_SYMBOL_GPL(find_bus);
 
 EXPORT_SYMBOL_GPL(bus_create_file);
 EXPORT_SYMBOL_GPL(bus_remove_file);