Skip to content

Commit bb4ad73

Browse files
steffen-eidenhcahca
authored andcommitted
s390/uv: Refactor uv-sysfs creation
Streamline the sysfs generation to make it more extensible. Add a function to create a sysfs entry in the uv-sysfs dir. Use this function for the query directory. Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com> Signed-off-by: Steffen Eiden <seiden@linux.ibm.com> Link: https://lore.kernel.org/r/20241015113940.3088249-2-seiden@linux.ibm.com Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent c3a04f7 commit bb4ad73

File tree

1 file changed

+22
-10
lines changed
  • arch/s390/kernel

1 file changed

+22
-10
lines changed

arch/s390/kernel/uv.c

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,24 @@ static const struct attribute *uv_prot_virt_attrs[] = {
753753
static struct kset *uv_query_kset;
754754
static struct kobject *uv_kobj;
755755

756-
static int __init uv_info_init(void)
756+
static int __init uv_sysfs_dir_init(const struct attribute_group *grp,
757+
struct kset **uv_dir_kset, const char *name)
758+
{
759+
struct kset *kset;
760+
int rc;
761+
762+
kset = kset_create_and_add(name, NULL, uv_kobj);
763+
if (!kset)
764+
return -ENOMEM;
765+
*uv_dir_kset = kset;
766+
767+
rc = sysfs_create_group(&kset->kobj, grp);
768+
if (rc)
769+
kset_unregister(kset);
770+
return rc;
771+
}
772+
773+
static int __init uv_sysfs_init(void)
757774
{
758775
int rc = -ENOMEM;
759776

@@ -768,22 +785,17 @@ static int __init uv_info_init(void)
768785
if (rc)
769786
goto out_kobj;
770787

771-
uv_query_kset = kset_create_and_add("query", NULL, uv_kobj);
772-
if (!uv_query_kset) {
773-
rc = -ENOMEM;
788+
rc = uv_sysfs_dir_init(&uv_query_attr_group, &uv_query_kset, "query");
789+
if (rc)
774790
goto out_ind_files;
775-
}
776791

777-
rc = sysfs_create_group(&uv_query_kset->kobj, &uv_query_attr_group);
778-
if (!rc)
779-
return 0;
792+
return 0;
780793

781-
kset_unregister(uv_query_kset);
782794
out_ind_files:
783795
sysfs_remove_files(uv_kobj, uv_prot_virt_attrs);
784796
out_kobj:
785797
kobject_del(uv_kobj);
786798
kobject_put(uv_kobj);
787799
return rc;
788800
}
789-
device_initcall(uv_info_init);
801+
device_initcall(uv_sysfs_init);

0 commit comments

Comments
 (0)