Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b477705 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

kobject: convert s390 hypervisor to use kobject_create 



We don't need a kset here, a simple kobject will do just fine, so
dynamically create the kobject and use it.

Thanks to Cornelia for the build fix.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Michael Holzheu <holzheu@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2d72fc00

arch/s390/hypfs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static struct super_operations hypfs_s_ops = { 
	.show_options	= hypfs_show_options,

};



static decl_subsys(s390, NULL);

static struct kobject *s390_kobj;



static int __init hypfs_init(void)

{
@@ -506,17 +506,18 @@ static int __init hypfs_init(void) 
			goto fail_diag;

		}

	}

	s390_subsys.kobj.parent = hypervisor_kobj;

	rc = subsystem_register(&s390_subsys);

	if (rc)

	s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);

	if (!s390_kobj) {

		rc = -ENOMEM;;

		goto fail_sysfs;

	}

	rc = register_filesystem(&hypfs_type);

	if (rc)

		goto fail_filesystem;

	return 0;



fail_filesystem:

	subsystem_unregister(&s390_subsys);

	kobject_unregister(s390_kobj);

fail_sysfs:

	if (!MACHINE_IS_VM)

		hypfs_diag_exit();
@@ -530,7 +531,7 @@ static void __exit hypfs_exit(void) 
	if (!MACHINE_IS_VM)

		hypfs_diag_exit();

	unregister_filesystem(&hypfs_type);

	subsystem_unregister(&s390_subsys);

	kobject_unregister(s390_kobj);

}



module_init(hypfs_init)