diff options
Diffstat (limited to 'drivers/parisc')
-rw-r--r-- | drivers/parisc/pdc_stable.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index ebb09e98d215..1382be64cc3f 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c | |||
@@ -964,8 +964,8 @@ static struct subsys_attribute *pdcs_subsys_attrs[] = { | |||
964 | NULL, | 964 | NULL, |
965 | }; | 965 | }; |
966 | 966 | ||
967 | static decl_subsys(paths, &ktype_pdcspath, NULL); | 967 | static decl_subsys(paths, NULL); |
968 | static decl_subsys(stable, NULL, NULL); | 968 | static decl_subsys(stable, NULL); |
969 | 969 | ||
970 | /** | 970 | /** |
971 | * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage. | 971 | * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage. |
@@ -997,7 +997,8 @@ pdcs_register_pathentries(void) | |||
997 | 997 | ||
998 | if ((err = kobject_set_name(&entry->kobj, "%s", entry->name))) | 998 | if ((err = kobject_set_name(&entry->kobj, "%s", entry->name))) |
999 | return err; | 999 | return err; |
1000 | kobj_set_kset_s(entry, paths_subsys); | 1000 | entry->kobj.kset = &paths_subsys; |
1001 | entry->kobj.ktype = &ktype_pdcspath; | ||
1001 | if ((err = kobject_register(&entry->kobj))) | 1002 | if ((err = kobject_register(&entry->kobj))) |
1002 | return err; | 1003 | return err; |
1003 | 1004 | ||
@@ -1072,7 +1073,7 @@ pdc_stable_init(void) | |||
1072 | error = subsys_create_file(&stable_subsys, attr); | 1073 | error = subsys_create_file(&stable_subsys, attr); |
1073 | 1074 | ||
1074 | /* register the paths subsys as a subsystem of stable subsys */ | 1075 | /* register the paths subsys as a subsystem of stable subsys */ |
1075 | kobj_set_kset_s(&paths_subsys, stable_subsys); | 1076 | paths_subsys.kobj.kset = &stable_subsys; |
1076 | if ((rc = subsystem_register(&paths_subsys))) | 1077 | if ((rc = subsystem_register(&paths_subsys))) |
1077 | goto fail_subsysreg; | 1078 | goto fail_subsysreg; |
1078 | 1079 | ||