Skip to contentSkip to conversation

s390/sclp_sd: use default_groups in kobj_type

PATCH In review Greg Kroah-Hartman 2 participants 2 messages Jan 6, 2022 – Jan 8, 2022 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390/sclp_sd: use default_groups in kobj_type

There are currently 2 ways to create a set of sysfs files for a kobj_type, through the default_attrs field, and the default_groups field. Move the sclp_sd sysfs code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.

Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Alexander Gordeev <[email protected]>
Cc Peter Oberparleiter <[email protected]>
---
 drivers/s390/char/sclp_sd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/char/sclp_sd.c +2 -1
index 25c2d760f6e6..f9e164be7568 100644
@@ -438,11 +438,12 @@ static struct attribute *sclp_sd_file_default_attrs[] = {
 	&reload_attr.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(sclp_sd_file_default);
 
 static struct kobj_type sclp_sd_file_ktype = {
 	.sysfs_ops = &kobj_sysfs_ops,
 	.release = sclp_sd_file_release,
-	.default_attrs = sclp_sd_file_default_attrs,
+	.default_groups = sclp_sd_file_default_groups,
 };
 
 /**
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 14 lines · Greg Kroah-Hartman

There are currently 2 ways to create a set of sysfs files for a kobj_type, through the default_attrs field, and the default_groups field. Move the sclp_sd sysfs code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.

Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Alexander Gordeev <[email protected]>
Cc Peter Oberparleiter <[email protected]>
Quoted 3 lines
---
 drivers/s390/char/sclp_sd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Appplied, thanks!