Commit c97415a7 authored by Stefan Achatz's avatar Stefan Achatz Committed by Jiri Kosina

sysfs: Introducing binary attributes for struct class

Added dev_bin_attrs to struct class similar to existing dev_attrs.
Signed-off-by: default avatarStefan Achatz <erazor_de@users.sourceforge.net>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a7153258
...@@ -338,6 +338,35 @@ static void device_remove_attributes(struct device *dev, ...@@ -338,6 +338,35 @@ static void device_remove_attributes(struct device *dev,
device_remove_file(dev, &attrs[i]); device_remove_file(dev, &attrs[i]);
} }
static int device_add_bin_attributes(struct device *dev,
struct bin_attribute *attrs)
{
int error = 0;
int i;
if (attrs) {
for (i = 0; attr_name(attrs[i]); i++) {
error = device_create_bin_file(dev, &attrs[i]);
if (error)
break;
}
if (error)
while (--i >= 0)
device_remove_bin_file(dev, &attrs[i]);
}
return error;
}
static void device_remove_bin_attributes(struct device *dev,
struct bin_attribute *attrs)
{
int i;
if (attrs)
for (i = 0; attr_name(attrs[i]); i++)
device_remove_bin_file(dev, &attrs[i]);
}
static int device_add_groups(struct device *dev, static int device_add_groups(struct device *dev,
const struct attribute_group **groups) const struct attribute_group **groups)
{ {
...@@ -378,12 +407,15 @@ static int device_add_attrs(struct device *dev) ...@@ -378,12 +407,15 @@ static int device_add_attrs(struct device *dev)
error = device_add_attributes(dev, class->dev_attrs); error = device_add_attributes(dev, class->dev_attrs);
if (error) if (error)
return error; return error;
error = device_add_bin_attributes(dev, class->dev_bin_attrs);
if (error)
goto err_remove_class_attrs;
} }
if (type) { if (type) {
error = device_add_groups(dev, type->groups); error = device_add_groups(dev, type->groups);
if (error) if (error)
goto err_remove_class_attrs; goto err_remove_class_bin_attrs;
} }
error = device_add_groups(dev, dev->groups); error = device_add_groups(dev, dev->groups);
...@@ -395,6 +427,9 @@ static int device_add_attrs(struct device *dev) ...@@ -395,6 +427,9 @@ static int device_add_attrs(struct device *dev)
err_remove_type_groups: err_remove_type_groups:
if (type) if (type)
device_remove_groups(dev, type->groups); device_remove_groups(dev, type->groups);
err_remove_class_bin_attrs:
if (class)
device_remove_bin_attributes(dev, class->dev_bin_attrs);
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);
...@@ -412,8 +447,10 @@ static void device_remove_attrs(struct device *dev) ...@@ -412,8 +447,10 @@ static void device_remove_attrs(struct device *dev)
if (type) if (type)
device_remove_groups(dev, type->groups); device_remove_groups(dev, type->groups);
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);
}
} }
......
...@@ -197,6 +197,7 @@ struct class { ...@@ -197,6 +197,7 @@ struct class {
struct class_attribute *class_attrs; struct class_attribute *class_attrs;
struct device_attribute *dev_attrs; struct device_attribute *dev_attrs;
struct bin_attribute *dev_bin_attrs;
struct kobject *dev_kobj; struct kobject *dev_kobj;
int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment