mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
Drivers: clean up direct setting of the name of a kset
A kset should not have its name set directly, so dynamically set the name at runtime. This is needed to remove the static array in the kobject structure which will be changed in a future patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user