Drivers: clean up direct setting of the name of a kset (34980ca8) · Commits · 戴 / test

drivers/edac/edac_mc_sysfs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,7 @@ static struct kobj_type ktype_mc_set_attribs = {
		* /sys/devices/system/edac/mc
		*/
		static struct kset mc_kset = {
		.kobj = {.name = "mc", .ktype = &ktype_mc_set_attribs },
		.kobj = {.ktype = &ktype_mc_set_attribs },
		.ktype = &ktype_mci,
		};

		@@ -1010,6 +1010,7 @@ int edac_sysfs_setup_mc_kset(void)
		}

		/* Init the MC's kobject */
		kobject_set_name(&mc_kset.kobj, "mc");
		mc_kset.kobj.parent = &edac_class->kset.kobj;

		/* register the mc_kset */

+3 −3

Original line number	Diff line number	Diff line
		@@ -129,17 +129,17 @@ struct kobj_type ktype_dlpar_io = {
		};

		struct kset dlpar_io_kset = {
		.kobj = {.name = DLPAR_KOBJ_NAME,
		.ktype = &ktype_dlpar_io,
		.kobj = {.ktype = &ktype_dlpar_io,
		.parent = &pci_hotplug_slots_subsys.kobj},
		.ktype = &ktype_dlpar_io,
		};

		int dlpar_sysfs_init(void)
		{
		kobject_set_name(&dlpar_io_kset.kobj, DLPAR_KOBJ_NAME);
		if (kset_register(&dlpar_io_kset)) {
		printk(KERN_ERR "rpadlpar_io: cannot register kset for %s\n",
		dlpar_io_kset.kobj.name);
		kobject_name(&dlpar_io_kset.kobj));
		return -EINVAL;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,6 @@ static struct kobj_type dlm_ktype = {
		};

		static struct kset dlm_kset = {
		.kobj = {.name = "dlm",},
		.ktype = &dlm_ktype,
		};

		@@ -228,6 +227,7 @@ int dlm_lockspace_init(void)
		INIT_LIST_HEAD(&lslist);
		spin_lock_init(&lslist_lock);

		kobject_set_name(&dlm_kset.kobj, "dlm");
		kobj_set_kset_s(&dlm_kset, kernel_subsys);
		error = kset_register(&dlm_kset);
		if (error)

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,6 @@ static struct kobj_type gdlm_ktype = {
		};

		static struct kset gdlm_kset = {
		.kobj = {.name = "lock_dlm",},
		.ktype = &gdlm_ktype,
		};

		@@ -224,6 +223,7 @@ int gdlm_sysfs_init(void)
		{
		int error;

		kobject_set_name(&gdlm_kset.kobj, "lock_dlm");
		kobj_set_kset_s(&gdlm_kset, kernel_subsys);
		error = kset_register(&gdlm_kset);
		if (error)

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,6 @@ static struct kobj_type gfs2_ktype = {
		};

		static struct kset gfs2_kset = {
		.kobj = {.name = "gfs2"},
		.ktype = &gfs2_ktype,
		};

		@@ -553,6 +552,7 @@ int gfs2_sys_init(void)
		{
		gfs2_sys_margs = NULL;
		spin_lock_init(&gfs2_sys_margs_lock);
		kobject_set_name(&gfs2_kset.kobj, "gfs2");
		kobj_set_kset_s(&gfs2_kset, fs_subsys);
		return kset_register(&gfs2_kset);
		}