korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

driver-core: remove struct bus_type.drv_attrs

Browse Source 
Now that all in-kernel users of bus_type.drv_attrs have been converted
to use drv_groups instead, the drv_attrs field, and logic surrounding
it, can be removed.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-09-27 21:47:21 -07:00
parent b4e46138f9
commit e18945b159
2 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/base/bus.c
View File

@ -591,37 +591,6 @@ void bus_remove_device(struct device *dev)
bus_put(dev->bus); bus_put(dev->bus);
} }
static int driver_add_attrs(struct bus_type *bus, struct device_driver *drv)
{
int error = 0;
int i;
if (bus->drv_attrs) {
for (i = 0; bus->drv_attrs[i].attr.name; i++) {
error = driver_create_file(drv, &bus->drv_attrs[i]);
if (error)
goto err;
}
}
done:
return error;
err:
while (--i >= 0)
driver_remove_file(drv, &bus->drv_attrs[i]);
goto done;
}
static void driver_remove_attrs(struct bus_type *bus,
struct device_driver *drv)
{
int i;
if (bus->drv_attrs) {
for (i = 0; bus->drv_attrs[i].attr.name; i++)
driver_remove_file(drv, &bus->drv_attrs[i]);
}
}
static int __must_check add_bind_files(struct device_driver *drv) static int __must_check add_bind_files(struct device_driver *drv)
{ {
int ret; int ret;
@ -720,16 +689,12 @@ int bus_add_driver(struct device_driver *drv)
printk(KERN_ERR "%s: uevent attr (%s) failed\n", printk(KERN_ERR "%s: uevent attr (%s) failed\n",
__func__, drv->name); __func__, drv->name);
} }
error = driver_add_attrs(bus, drv); error = driver_add_groups(drv, bus->drv_groups);
if (error) { if (error) {
/* How the hell do we get out of this pickle? Give up */ /* How the hell do we get out of this pickle? Give up */
printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n",
__func__, drv->name);
}
error = driver_add_groups(drv, bus->drv_groups);
if (error)
printk(KERN_ERR "%s: driver_create_groups(%s) failed\n", printk(KERN_ERR "%s: driver_create_groups(%s) failed\n",
__func__, drv->name); __func__, drv->name);
}
if (!drv->suppress_bind_attrs) { if (!drv->suppress_bind_attrs) {
error = add_bind_files(drv); error = add_bind_files(drv);
@ -766,7 +731,6 @@ void bus_remove_driver(struct device_driver *drv)
if (!drv->suppress_bind_attrs) if (!drv->suppress_bind_attrs)
remove_bind_files(drv); remove_bind_files(drv);
driver_remove_attrs(drv->bus, drv);
driver_remove_groups(drv, drv->bus->drv_groups); driver_remove_groups(drv, drv->bus->drv_groups);
driver_remove_file(drv, &driver_attr_uevent); driver_remove_file(drv, &driver_attr_uevent);
klist_remove(&drv->p->knode_bus); klist_remove(&drv->p->knode_bus);

2
include/linux/device.h
View File

@ -64,7 +64,6 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
* @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id). * @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id).
* @dev_root: Default device to use as the parent. * @dev_root: Default device to use as the parent.
* @dev_attrs: Default attributes of the devices on 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. * @bus_groups: Default attributes of the bus.
* @dev_groups: Default attributes of the devices on the bus. * @dev_groups: Default attributes of the devices on the bus.
* @drv_groups: Default attributes of the device drivers on the bus. * @drv_groups: Default attributes of the device drivers on the bus.
@ -106,7 +105,6 @@ struct bus_type {
const char *dev_name; const char *dev_name;
struct device *dev_root; struct device *dev_root;
struct device_attribute *dev_attrs; /* use dev_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; const struct attribute_group **bus_groups;
const struct attribute_group **dev_groups; const struct attribute_group **dev_groups;
const struct attribute_group **drv_groups; const struct attribute_group **drv_groups;