kobject: remove struct kobj_type from struct kset

We don't need a "default" ktype for a kset.  We should set this
explicitly every time for each kset.  This change is needed so that we
can make ksets dynamic, and cleans up one of the odd, undocumented
assumption that the kset/kobject/ktype model has.

This patch is based on a lot of help from Kay Sievers.

Nasty bug in the block code was found by Dave Young
<hidave.darkstar@gmail.com>

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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[] = {
         NULL,
 };
 
-static decl_subsys(paths, &ktype_pdcspath, NULL);
-static decl_subsys(stable, NULL, NULL);
+static decl_subsys(paths, NULL);
+static decl_subsys(stable, NULL);
 
 /**
  * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage.
@@ -997,7 +997,8 @@ pdcs_register_pathentries(void)
 
                 if ((err = kobject_set_name(&entry->kobj, "%s", entry->name)))
                         return err;
-                kobj_set_kset_s(entry, paths_subsys);
+                entry->kobj.kset = &paths_subsys;
+                entry->kobj.ktype = &ktype_pdcspath;
                 if ((err = kobject_register(&entry->kobj)))
                         return err;
                 
@@ -1072,7 +1073,7 @@ pdc_stable_init(void)
                         error = subsys_create_file(&stable_subsys, attr);
         
         /* register the paths subsys as a subsystem of stable subsys */
-        kobj_set_kset_s(&paths_subsys, stable_subsys);
+        paths_subsys.kobj.kset = &stable_subsys;
         if ((rc = subsystem_register(&paths_subsys)))
                 goto fail_subsysreg;