x86/CPU/AMD: use default_groups in kobj_type
Subsystems (3)
PATCH 1/1 x86/CPU/AMD: 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 AMD mce 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.
--- arch/x86/kernel/cpu/mce/amd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/amd.c +2 -1
@@ -1171,6 +1171,7 @@ static struct attribute *default_attrs[] = {NULL ,/* possibly interrupt_enable if supported, see below */ NULL , }; +ATTRIBUTE_GROUPS (default);#define to_block (k) container_of(k, struct threshold_block, kobj)#define to_attr (a) container_of(a, struct threshold_attr, attr)
@@ -1207,7 +1208,7 @@ static void threshold_block_release(struct kobject *kobj);static struct kobj_type threshold_ktype = { .sysfs_ops = &threshold_ops, - .default_attrs = default_attrs, + .default_groups = default_groups, .release = threshold_block_release, };
Signature · 1 line
2.34.1
Quoted 44 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the AMD mce sysfs code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Tony Luck <[email protected]>Cc Borislav Petkov <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/x86/kernel/cpu/mce/amd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/kernel/cpu/mce/amd.c +2
-1@@ -1171,6 +1171,7 @@ static struct attribute *default_attrs[] = {NULL ,/* possibly interrupt_enable if supported, see below */ NULL , }; +ATTRIBUTE_GROUPS (default);#define to_block (k) container_of(k, struct threshold_block, kobj)#define to_attr (a) container_of(a, struct threshold_attr, attr)@@ -1207,7 +1208,7 @@ static void threshold_block_release(struct kobject *kobj);static struct kobj_type threshold_ktype = { .sysfs_ops = &threshold_ops, - .default_attrs = default_attrs, + .default_groups = default_groups, .release = threshold_block_release, };Signature · 1 line
2.34.1
Oops, nope, more work needs to happen on this change, sorry. I'll send out a v2 soon...
thanks,
greg k-h