diff options
| author | Kimberly Brown <kimbrownkd@gmail.com> | 2019-04-01 22:51:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-25 16:06:11 -0400 |
| commit | 800f5aa1e7e1093fce197eecf2ff05b8491a5935 (patch) | |
| tree | c1d42dc8cff38e8d94becd3650b3af00e10dcda7 /block/blk-integrity.c | |
| parent | c484a6783d2b800ebbb110b28b0d96444f8b81ca (diff) | |
block: Replace all ktype default_attrs with groups
The kobj_type default_attrs field is being replaced by the
default_groups field. Replace all of the ktype default_attrs fields in
the block subsystem with default_groups and use the ATTRIBUTE_GROUPS
macro to create the default groups.
Remove default_ctx_attrs[] because it doesn't contain any attributes.
This patch was tested by verifying that the sysfs files for the
attributes in the default groups were created.
Signed-off-by: Kimberly Brown <kimbrownkd@gmail.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/blk-integrity.c')
| -rw-r--r-- | block/blk-integrity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index d1ab089e0919..85864c71e858 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c | |||
| @@ -365,6 +365,7 @@ static struct attribute *integrity_attrs[] = { | |||
| 365 | &integrity_device_entry.attr, | 365 | &integrity_device_entry.attr, |
| 366 | NULL, | 366 | NULL, |
| 367 | }; | 367 | }; |
| 368 | ATTRIBUTE_GROUPS(integrity); | ||
| 368 | 369 | ||
| 369 | static const struct sysfs_ops integrity_ops = { | 370 | static const struct sysfs_ops integrity_ops = { |
| 370 | .show = &integrity_attr_show, | 371 | .show = &integrity_attr_show, |
| @@ -372,7 +373,7 @@ static const struct sysfs_ops integrity_ops = { | |||
| 372 | }; | 373 | }; |
| 373 | 374 | ||
| 374 | static struct kobj_type integrity_ktype = { | 375 | static struct kobj_type integrity_ktype = { |
| 375 | .default_attrs = integrity_attrs, | 376 | .default_groups = integrity_groups, |
| 376 | .sysfs_ops = &integrity_ops, | 377 | .sysfs_ops = &integrity_ops, |
| 377 | }; | 378 | }; |
| 378 | 379 | ||