Merge tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 6470eb8088f4f4da92215f5009c3b63a2a492876..e162c9a789baea95387e653b4d8efe824f117516 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -466,35 +466,6 @@ int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
 }
 EXPORT_SYMBOL_GPL(bus_for_each_drv);
 
-static int device_add_attrs(struct bus_type *bus, struct device *dev)
-{
-       int error = 0;
-       int i;
-
-       if (!bus->dev_attrs)
-               return 0;
-
-       for (i = 0; bus->dev_attrs[i].attr.name; i++) {
-               error = device_create_file(dev, &bus->dev_attrs[i]);
-               if (error) {
-                       while (--i >= 0)
-                               device_remove_file(dev, &bus->dev_attrs[i]);
-                       break;
-               }
-       }
-       return error;
-}
-
-static void device_remove_attrs(struct bus_type *bus, struct device *dev)
-{
-       int i;
-
-       if (bus->dev_attrs) {
-               for (i = 0; bus->dev_attrs[i].attr.name; i++)
-                       device_remove_file(dev, &bus->dev_attrs[i]);
-       }
-}
-
 /**
  * bus_add_device - add device to bus
  * @dev: device being added
@@ -510,12 +481,9 @@ int bus_add_device(struct device *dev)
 
        if (bus) {
                pr_debug("bus: '%s': add device %s\n", bus->name, dev_name(dev));
-               error = device_add_attrs(bus, dev);
-               if (error)
-                       goto out_put;
                error = device_add_groups(dev, bus->dev_groups);
                if (error)
-                       goto out_id;
+                       goto out_put;
                error = sysfs_create_link(&bus->p->devices_kset->kobj,
                                                &dev->kobj, dev_name(dev));
                if (error)
@@ -532,8 +500,6 @@ out_subsys:
        sysfs_remove_link(&bus->p->devices_kset->kobj, dev_name(dev));
 out_groups:
        device_remove_groups(dev, bus->dev_groups);
-out_id:
-       device_remove_attrs(bus, dev);
 out_put:
        bus_put(dev->bus);
        return error;
@@ -590,7 +556,6 @@ void bus_remove_device(struct device *dev)
        sysfs_remove_link(&dev->kobj, "subsystem");
        sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
                          dev_name(dev));
-       device_remove_attrs(dev->bus, dev);
        device_remove_groups(dev, dev->bus->dev_groups);
        if (klist_node_attached(&dev->p->knode_bus))
                klist_del(&dev->p->knode_bus);
@@ -648,10 +613,7 @@ static void remove_probe_files(struct bus_type *bus)
 static ssize_t uevent_store(struct device_driver *drv, const char *buf,
                            size_t count)
 {
-       enum kobject_action action;
-
-       if (kobject_action_type(buf, count, &action) == 0)
-               kobject_uevent(&drv->p->kobj, action);
+       kobject_synth_uevent(&drv->p->kobj, buf, count);
        return count;
 }
 static DRIVER_ATTR_WO(uevent);
@@ -868,10 +830,7 @@ static void klist_devices_put(struct klist_node *n)
 static ssize_t bus_uevent_store(struct bus_type *bus,
                                const char *buf, size_t count)
 {
-       enum kobject_action action;
-
-       if (kobject_action_type(buf, count, &action) == 0)
-               kobject_uevent(&bus->p->subsys.kobj, action);
+       kobject_synth_uevent(&bus->p->subsys.kobj, buf, count);
        return count;
 }
 static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);