luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver core: add default groups to struct class

Browse Source 
We should be using groups, not attribute lists, for classes to allow
subdirectories, and soon, binary files.  Groups are just more flexible
overall, so add them.

The dev_attrs list will go away after all in-kernel users are converted
to use dev_groups.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-14 16:05:58 -07:00
parent 39ef311204
commit d05a6f96c7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/core.c
View File

@ -528,9 +528,12 @@ static int device_add_attrs(struct device *dev)
int error; int error;
if (class) { if (class) {
error = device_add_attributes(dev, class->dev_attrs); error = device_add_groups(dev, class->dev_groups);
if (error) if (error)
return error; return error;
error = device_add_attributes(dev, class->dev_attrs);
if (error)
goto err_remove_class_groups;
error = device_add_bin_attributes(dev, class->dev_bin_attrs); error = device_add_bin_attributes(dev, class->dev_bin_attrs);
if (error) if (error)
goto err_remove_class_attrs; goto err_remove_class_attrs;
@ -563,6 +566,9 @@ static int device_add_attrs(struct device *dev)
err_remove_class_attrs: err_remove_class_attrs:
if (class) if (class)
device_remove_attributes(dev, class->dev_attrs); device_remove_attributes(dev, class->dev_attrs);
err_remove_class_groups:
if (class)
device_remove_groups(dev, class->dev_groups);
return error; return error;
} }
@ -581,6 +587,7 @@ static void device_remove_attrs(struct device *dev)
if (class) { if (class) {
device_remove_attributes(dev, class->dev_attrs); device_remove_attributes(dev, class->dev_attrs);
device_remove_bin_attributes(dev, class->dev_bin_attrs); device_remove_bin_attributes(dev, class->dev_bin_attrs);
device_remove_groups(dev, class->dev_groups);
} }
} }

4
include/linux/device.h
View File

@ -320,6 +320,7 @@ int subsys_virtual_register(struct bus_type *subsys,
* @name: Name of the class. * @name: Name of the class.
* @owner: The module owner. * @owner: The module owner.
* @class_attrs: Default attributes of this class. * @class_attrs: Default attributes of this class.
* @dev_groups: Default attributes of the devices that belong to the class.
* @dev_attrs: Default attributes of the devices belong to the class. * @dev_attrs: Default attributes of the devices belong to the class.
* @dev_bin_attrs: Default binary attributes of the devices belong to the class. * @dev_bin_attrs: Default binary attributes of the devices belong to the class.
* @dev_kobj: The kobject that represents this class and links it into the hierarchy. * @dev_kobj: The kobject that represents this class and links it into the hierarchy.
@ -349,7 +350,8 @@ struct class {
struct module *owner; struct module *owner;
struct class_attribute *class_attrs; struct class_attribute *class_attrs;
struct device_attribute *dev_attrs; struct device_attribute *dev_attrs; /* use dev_groups instead */
const struct attribute_group **dev_groups;
struct bin_attribute *dev_bin_attrs; struct bin_attribute *dev_bin_attrs;
struct kobject *dev_kobj; struct kobject *dev_kobj;