Messages in this thread Patch in this message | | | Date | Wed, 10 Jul 2013 15:05:31 -0700 | From | Greg Kroah-Hartman <> | Subject | [PATCH 7/6] driver core: add default groups to struct class |
| |
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.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Forgot this one in the series, it adds support to classes for groups, so that we can handle binary attributes properly for them as well.
drivers/base/core.c | 8 +++++++- include/linux/device.h | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-)
--- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -528,9 +528,12 @@ static int device_add_attrs(struct devic int error; if (class) { - error = device_add_attributes(dev, class->dev_attrs); + error = device_add_groups(dev, class->dev_groups); if (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); if (error) goto err_remove_class_attrs; @@ -563,6 +566,9 @@ static int device_add_attrs(struct devic err_remove_class_attrs: if (class) device_remove_attributes(dev, class->dev_attrs); + err_remove_class_groups: + if (class) + device_remove_groups(dev, class->dev_groups); return error; } --- a/include/linux/device.h +++ b/include/linux/device.h @@ -313,6 +313,7 @@ int subsys_virtual_register(struct bus_t * @name: Name of the class. * @owner: The module owner. * @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_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. @@ -342,7 +343,8 @@ struct class { struct module *owner; 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 kobject *dev_kobj;
| |