Skip to contentSkip to conversation

powerpc/opal: use default_groups in kobj_type

PATCH Applied Greg Kroah-Hartman 2 participants 2 messages Jan 4, 2022 – Jan 10, 2022 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/opal: 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 powerpc opal dump and elog 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 Joel Stanley <[email protected]>
Cc Vasant Hegde <[email protected]>
---
 arch/powerpc/platforms/powernv/opal-dump.c | 3 ++-
 arch/powerpc/platforms/powernv/opal-elog.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/opal-dump.c +2 -1
index 717d1d30ade5..410ed5b9de29 100644
@@ -208,11 +208,12 @@ static struct attribute *dump_default_attrs[] = {
 	&ack_attribute.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(dump_default);
 
 static struct kobj_type dump_ktype = {
 	.sysfs_ops = &dump_sysfs_ops,
 	.release = &dump_release,
-	.default_attrs = dump_default_attrs,
+	.default_groups = dump_default_groups,
 };
 
 static int64_t dump_read_info(uint32_t *dump_id, uint32_t *dump_size, uint32_t *dump_type)
arch/powerpc/platforms/powernv/opal-elog.c +2 -1
index 5821b0fa8614..554fdd7f88b8 100644
@@ -144,11 +144,12 @@ static struct attribute *elog_default_attrs[] = {
 	&ack_attribute.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(elog_default);
 
 static struct kobj_type elog_ktype = {
 	.sysfs_ops = &elog_sysfs_ops,
 	.release = &elog_release,
-	.default_attrs = elog_default_attrs,
+	.default_groups = elog_default_groups,
 };
 
 /* Maximum size of a single log on FSP is 16KB */
Signature · 1 line
2.34.1
#1 lore raw
Quoted 8 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 powerpc opal dump and elog 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.

[...]

Applied to powerpc/next.

[1/1] powerpc/opal: use default_groups in kobj_type

      https://git.kernel.org/powerpc/c/32a1bda4b12a3d324bd585e1aa20dac824ab719c

cheers