From afca4cbe3a25dbe16424e6199793b38f41a17ed9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Dec 2021 15:13:32 +0100 Subject: x86/platform/uv: 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 uv 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: Justin Ernst Cc: Hans de Goede Cc: Mark Gross Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Greg Kroah-Hartman Link: https://lore.kernel.org/r/20211229141332.2552428-1-gregkh@linuxfoundation.org Signed-off-by: Hans de Goede --- drivers/platform/x86/uv_sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/platform') diff --git a/drivers/platform/x86/uv_sysfs.c b/drivers/platform/x86/uv_sysfs.c index 956a354b57c1..625b0b79d185 100644 --- a/drivers/platform/x86/uv_sysfs.c +++ b/drivers/platform/x86/uv_sysfs.c @@ -175,6 +175,7 @@ static struct attribute *uv_hub_attrs[] = { &cnode_attribute.attr, NULL, }; +ATTRIBUTE_GROUPS(uv_hub); static void hub_release(struct kobject *kobj) { @@ -205,7 +206,7 @@ static const struct sysfs_ops hub_sysfs_ops = { static struct kobj_type hub_attr_type = { .release = hub_release, .sysfs_ops = &hub_sysfs_ops, - .default_attrs = uv_hub_attrs, + .default_groups = uv_hub_groups, }; static int uv_hubs_init(void) @@ -327,6 +328,7 @@ static struct attribute *uv_port_attrs[] = { &uv_port_conn_port_attribute.attr, NULL, }; +ATTRIBUTE_GROUPS(uv_port); static void uv_port_release(struct kobject *kobj) { @@ -357,7 +359,7 @@ static const struct sysfs_ops uv_port_sysfs_ops = { static struct kobj_type uv_port_attr_type = { .release = uv_port_release, .sysfs_ops = &uv_port_sysfs_ops, - .default_attrs = uv_port_attrs, + .default_groups = uv_port_groups, }; static int uv_ports_init(void) -- cgit v1.2.3