diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:25:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:25:27 -0700 |
| commit | f2fea6a31b09a12fe4d9e9e3f9a8e2be017ad611 (patch) | |
| tree | c16afc7b5e4b92cb361c6d2b3ec6f0e9a780a476 /f1.patch | |
| parent | e930b8544abee8d7894d5f55af16cb5e7be25f9f (diff) | |
| download | patches-f2fea6a31b09a12fe4d9e9e3f9a8e2be017ad611.tar.gz | |
updates
Diffstat (limited to 'f1.patch')
| -rw-r--r-- | f1.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/f1.patch b/f1.patch deleted file mode 100644 index a876248b348178..00000000000000 --- a/f1.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- - drivers/base/bus.c | 42 ------------------------------------------ - include/linux/device.h | 2 -- - 2 files changed, 44 deletions(-) - ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -845,42 +845,6 @@ struct bus_type *find_bus(char *name) - } - #endif /* 0 */ - -- --/** -- * bus_add_attrs - Add default attributes for this bus. -- * @bus: Bus that has just been registered. -- */ -- --static int bus_add_attrs(struct bus_type *bus) --{ -- int error = 0; -- int i; -- -- if (bus->bus_attrs) { -- for (i = 0; attr_name(bus->bus_attrs[i]); i++) { -- error = bus_create_file(bus, &bus->bus_attrs[i]); -- if (error) -- goto err; -- } -- } --done: -- return error; --err: -- while (--i >= 0) -- bus_remove_file(bus, &bus->bus_attrs[i]); -- goto done; --} -- --static void bus_remove_attrs(struct bus_type *bus) --{ -- int i; -- -- if (bus->bus_attrs) { -- for (i = 0; attr_name(bus->bus_attrs[i]); i++) -- bus_remove_file(bus, &bus->bus_attrs[i]); -- } --} -- - static int bus_add_groups(struct bus_type *bus, - const struct attribute_group **groups) - { -@@ -1001,9 +965,6 @@ int bus_register(struct bus_type *bus) - if (retval) - goto bus_probe_files_fail; - -- retval = bus_add_attrs(bus); -- if (retval) -- goto bus_attrs_fail; - retval = bus_add_groups(bus, bus->bus_groups); - if (retval) - goto bus_groups_fail; -@@ -1012,8 +973,6 @@ int bus_register(struct bus_type *bus) - return 0; - - bus_groups_fail: -- bus_remove_attrs(bus); --bus_attrs_fail: - remove_probe_files(bus); - bus_probe_files_fail: - kset_unregister(bus->p->drivers_kset); -@@ -1042,7 +1001,6 @@ void bus_unregister(struct bus_type *bus - pr_debug("bus: '%s': unregistering\n", bus->name); - if (bus->dev_root) - device_unregister(bus->dev_root); -- bus_remove_attrs(bus); - bus_remove_groups(bus, bus->bus_groups); - remove_probe_files(bus); - kset_unregister(bus->p->drivers_kset); ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -63,7 +63,6 @@ extern void bus_remove_file(struct bus_t - * @name: The name of the bus. - * @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id). - * @dev_root: Default device to use as the parent. -- * @bus_attrs: Default attributes of the bus. - * @dev_attrs: Default attributes of the devices on the bus. - * @drv_attrs: Default attributes of the device drivers on the bus. - * @bus_groups: Default attributes of the bus. -@@ -106,7 +105,6 @@ struct bus_type { - const char *name; - const char *dev_name; - struct device *dev_root; -- struct bus_attribute *bus_attrs; /* use bus_groups instead */ - struct device_attribute *dev_attrs; /* use dev_groups instead */ - struct driver_attribute *drv_attrs; /* use drv_groups instead */ - const struct attribute_group **bus_groups; |