diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-02 18:48:47 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-23 11:29:17 -0600 |
| commit | fd1109711d7f76126e7cef947999f139b198dc15 (patch) | |
| tree | e108e3b02fa50e2bcb8456bbc5a4a0c90391c9e1 | |
| parent | 11f24fbdf511cf588c3a18e3208ee02d85db0020 (diff) | |
| download | op-kernel-dev-fd1109711d7f76126e7cef947999f139b198dc15.zip op-kernel-dev-fd1109711d7f76126e7cef947999f139b198dc15.tar.gz | |
[SCSI] attribute_container: update to use the group interface
This patch is the beginning of moving the attribute_containers to use
attribute groups exclusively. The attr element is now deprecated and
will eventually be removed (along with all the hand rolled code for
doing exactly what attribute groups do) when all the consumers are
converted to attribute groups.
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/base/attribute_container.c | 14 | ||||
| -rw-r--r-- | include/linux/attribute_container.h | 1 |
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c index 7370d7c..5bf25c6 100644 --- a/drivers/base/attribute_container.c +++ b/drivers/base/attribute_container.c @@ -320,9 +320,14 @@ attribute_container_add_attrs(struct class_device *classdev) struct class_device_attribute **attrs = cont->attrs; int i, error; - if (!attrs) + BUG_ON(attrs && cont->grp); + + if (!attrs && !cont->grp) return 0; + if (cont->grp) + return sysfs_create_group(&classdev->kobj, cont->grp); + for (i = 0; attrs[i]; i++) { error = class_device_create_file(classdev, attrs[i]); if (error) @@ -378,9 +383,14 @@ attribute_container_remove_attrs(struct class_device *classdev) struct class_device_attribute **attrs = cont->attrs; int i; - if (!attrs) + if (!attrs && !cont->grp) return; + if (cont->grp) { + sysfs_remove_group(&classdev->kobj, cont->grp); + return ; + } + for (i = 0; attrs[i]; i++) class_device_remove_file(classdev, attrs[i]); } diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h index 8ff2749..f558233 100644 --- a/include/linux/attribute_container.h +++ b/include/linux/attribute_container.h @@ -17,6 +17,7 @@ struct attribute_container { struct list_head node; struct klist containers; struct class *class; + struct attribute_group *grp; struct class_device_attribute **attrs; int (*match)(struct attribute_container *, struct device *); #define ATTRIBUTE_CONTAINER_NO_CLASSDEVS 0x01 |
