Skip to contentSkip to conversation

powerpc/pseries/vas: use default_groups in kobj_type

PATCH In review Greg Kroah-Hartman 2 participants 4 messages Mar 29, 2022 – Apr 5, 2022 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/pseries/vas: 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 pseries vas 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 Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Haren Myneni <[email protected]>
Cc Nicholas Piggin <[email protected]>

---

Note, I would like to take this through my driver-core tree for 5.18-rc2 as this is the last hold-out of the default_attrs field. It "snuck" in as new code for 5.18-rc1, any objection to me taking it?

thanks,

greg k-h

 arch/powerpc/platforms/pseries/vas-sysfs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/vas-sysfs.c +4 -2
index 4a7fcde5afc0..909535ca513a 100644
@@ -99,6 +99,7 @@ static struct attribute *vas_def_capab_attrs[] = {
 	&nr_used_credits_attribute.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(vas_def_capab);
 
 static struct attribute *vas_qos_capab_attrs[] = {
 	&nr_total_credits_attribute.attr,
@@ -106,6 +107,7 @@ static struct attribute *vas_qos_capab_attrs[] = {
 	&update_total_credits_attribute.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(vas_qos_capab);
 
 static ssize_t vas_type_show(struct kobject *kobj, struct attribute *attr,
 			     char *buf)
@@ -154,13 +156,13 @@ static const struct sysfs_ops vas_sysfs_ops = {
 static struct kobj_type vas_def_attr_type = {
 		.release	=	vas_type_release,
 		.sysfs_ops      =       &vas_sysfs_ops,
-		.default_attrs  =       vas_def_capab_attrs,
+		.default_groups	=	vas_def_capab_groups,
 };
 
 static struct kobj_type vas_qos_attr_type = {
 		.release	=	vas_type_release,
 		.sysfs_ops	=	&vas_sysfs_ops,
-		.default_attrs	=	vas_qos_capab_attrs,
+		.default_groups	=	vas_qos_capab_groups,
 };
 
 static char *vas_caps_kobj_name(struct vas_caps_entry *centry,
Signature · 1 line
2.35.1
#1 lore raw
Quoted 15 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 pseries vas 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 Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Haren Myneni <[email protected]>
Cc Nicholas Piggin <[email protected]>
Quoted 5 lines

---

Note, I would like to take this through my driver-core tree for 5.18-rc2 as this is the last hold-out of the default_attrs field. It "snuck" in as new code for 5.18-rc1, any objection to me taking it?

No objection, please take it via your tree.

cheers

#2 lore raw
Quoted 18 lines · Michael Ellerman
Quoted 17 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 pseries vas 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 Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Haren Myneni <[email protected]>
Cc Nicholas Piggin <[email protected]>

---

Quoted 5 lines
Quoted 3 lines

Note, I would like to take this through my driver-core tree for 5.18-rc2 as this is the last hold-out of the default_attrs field. It "snuck" in as new code for 5.18-rc1, any objection to me taking it?

No objection, please take it via your tree.

Thanks, will do!

#3 lore raw
In reply to Michael Ellerman
Quoted 18 lines · Michael Ellerman
Quoted 17 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 pseries vas 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 Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Haren Myneni <[email protected]>
Cc Nicholas Piggin <[email protected]>

---

Quoted 5 lines
Quoted 3 lines

Note, I would like to take this through my driver-core tree for 5.18-rc2 as this is the last hold-out of the default_attrs field. It "snuck" in as new code for 5.18-rc1, any objection to me taking it?

No objection, please take it via your tree.

Thanks, now queued up.

greg k-h