14 files changed, 37 insertions, 28 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index f4487c38d9f2..7c172d9d7acf 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -743,7 +743,7 @@ static int __init acpi_bus_init(void)
         return -ENODEV;
 }
 
-decl_subsys(acpi, NULL, NULL);
+decl_subsys(acpi, NULL);
 
 static int __init acpi_init(void)
 {
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 9a19b071c573..630956037e18 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -166,7 +166,7 @@ static struct kset_uevent_ops bus_uevent_ops = {
         .filter = bus_uevent_filter,
 };
 
-static decl_subsys(bus, &bus_ktype, &bus_uevent_ops);
+static decl_subsys(bus, &bus_uevent_ops);
 
 
 #ifdef CONFIG_HOTPLUG
@@ -639,6 +639,7 @@ int bus_add_driver(struct device_driver *drv)
         if (error)
                 goto out_put_bus;
         drv->kobj.kset = &bus->drivers;
+        drv->kobj.ktype = &driver_ktype;
         error = kobject_register(&drv->kobj);
         if (error)
                 goto out_put_bus;
@@ -851,6 +852,7 @@ int bus_register(struct bus_type * bus)
                 goto out;
 
         bus->subsys.kobj.kset = &bus_subsys;
+        bus->subsys.kobj.ktype = &bus_ktype;
 
         retval = subsystem_register(&bus->subsys);
         if (retval)
@@ -868,7 +870,6 @@ int bus_register(struct bus_type * bus)
 
         kobject_set_name(&bus->drivers.kobj, "drivers");
         bus->drivers.kobj.parent = &bus->subsys.kobj;
-        bus->drivers.ktype = &driver_ktype;
         retval = kset_register(&bus->drivers);
         if (retval)
                 goto bus_drivers_fail;
diff --git a/drivers/base/class.c b/drivers/base/class.c
index a863bb091e11..8ad98924cddb 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -71,7 +71,7 @@ static struct kobj_type class_ktype = {
 };
 
 /* Hotplug events for classes go to the class_obj subsys */
-static decl_subsys(class, &class_ktype, NULL);
+static decl_subsys(class, NULL);
 
 
 int class_create_file(struct class * cls, const struct class_attribute * attr)
@@ -150,6 +150,7 @@ int class_register(struct class * cls)
                 return error;
 
         cls->subsys.kobj.kset = &class_subsys;
+        cls->subsys.kobj.ktype = &class_ktype;
 
         error = subsystem_register(&cls->subsys);
         if (!error) {
@@ -452,7 +453,7 @@ static struct kset_uevent_ops class_uevent_ops = {
         .uevent =       class_uevent,
 };
 
-static decl_subsys(class_obj, &class_device_ktype, &class_uevent_ops);
+static decl_subsys(class_obj, &class_uevent_ops);
 
 
 static int class_device_add_attrs(struct class_device * cd)
@@ -537,7 +538,8 @@ static struct class_device_attribute class_uevent_attr =
 
 void class_device_initialize(struct class_device *class_dev)
 {
-        kobj_set_kset_s(class_dev, class_obj_subsys);
+        class_dev->kobj.kset = &class_obj_subsys;
+        class_dev->kobj.ktype = &class_device_ktype;
         kobject_init(&class_dev->kobj);
         INIT_LIST_HEAD(&class_dev->node);
 }
diff --git a/drivers/base/core.c b/drivers/base/core.c
index ce6b64c489ad..c8f2ac03d46d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -405,7 +405,7 @@ static struct device_attribute devt_attr =
  *      devices_subsys - structure to be registered with kobject core.
  */
 
-decl_subsys(devices, &device_ktype, &device_uevent_ops);
+decl_subsys(devices, &device_uevent_ops);
 
 
 /**
@@ -525,7 +525,8 @@ static void klist_children_put(struct klist_node *n)
 
 void device_initialize(struct device *dev)
 {
-        kobj_set_kset_s(dev, devices_subsys);
+        dev->kobj.kset = &devices_subsys;
+        dev->kobj.ktype = &device_ktype;
         kobject_init(&dev->kobj);
         klist_init(&dev->klist_children, klist_children_get,
                    klist_children_put);
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 90c862932169..336be0450d54 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,11 +15,12 @@
 
 #include "base.h"
 
-static decl_subsys(firmware, NULL, NULL);
+static decl_subsys(firmware, NULL);
 
 int firmware_register(struct kset *s)
 {
-        kobj_set_kset_s(s, firmware_subsys);
+        s->kobj.kset = &firmware_subsys;
+        s->kobj.ktype = NULL;
         return subsystem_register(s);
 }
 
diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 7080b413ddc9..14e75e9ec783 100644
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -11,7 +11,7 @@
 
 #include "base.h"
 
-decl_subsys(hypervisor, NULL, NULL);
+decl_subsys(hypervisor, NULL);
 EXPORT_SYMBOL_GPL(hypervisor_subsys);
 
 int __init hypervisor_init(void)
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index ac7ff6d0c6e5..7cf19fc318da 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -131,7 +131,7 @@ EXPORT_SYMBOL_GPL(sysdev_class_remove_file);
 /*
  * declare system_subsys
  */
-static decl_subsys(system, &ktype_sysdev_class, NULL);
+static decl_subsys(system, NULL);
 
 int sysdev_class_register(struct sysdev_class * cls)
 {
@@ -139,6 +139,7 @@ int sysdev_class_register(struct sysdev_class * cls)
                  kobject_name(&cls->kset.kobj));
         INIT_LIST_HEAD(&cls->drivers);
         cls->kset.kobj.parent = &system_subsys.kobj;
+        cls->kset.kobj.ktype = &ktype_sysdev_class;
         cls->kset.kobj.kset = &system_subsys;
         return kset_register(&cls->kset);
 }
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 3706b2bc0987..905fcd73c26e 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -744,7 +744,6 @@ static struct kobj_type ktype_mc_set_attribs = {
  */
 static struct kset mc_kset = {
         .kobj = {.ktype = &ktype_mc_set_attribs },
-        .ktype = &ktype_mci,
 };
 
 
@@ -767,6 +766,7 @@ int edac_mc_register_sysfs_main_kobj(struct mem_ctl_info *mci)
 
         /* this instance become part of the mc_kset */
         kobj_mci->kset = &mc_kset;
+        kobj_mci->ktype = &ktype_mci;
 
         /* set the name of the mc<id> object */
         err = kobject_set_name(kobj_mci, "mc%d", mci->mc_idx);
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6942e065e609..fc567fad3f7c 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -631,7 +631,7 @@ static struct kobj_type edd_ktype = {
         .default_attrs  = def_attrs,
 };
 
-static decl_subsys(edd, &edd_ktype, NULL);
+static decl_subsys(edd, NULL);
 
 
 /**
@@ -723,7 +723,8 @@ edd_device_register(struct edd_device *edev, int i)
         edd_dev_set_info(edev, i);
         kobject_set_name(&edev->kobj, "int13_dev%02x",
                          0x80 + i);
-        kobj_set_kset_s(edev,edd_subsys);
+        edev->kobj.kset = &edd_subsys;
+        edev->kobj.ktype = &edd_ktype;
         error = kobject_register(&edev->kobj);
         if (!error)
                 edd_populate_dir(edev);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 858a7b95933b..06ecdb9f6013 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -583,8 +583,8 @@ static struct subsys_attribute *efi_subsys_attrs[] = {
         NULL,   /* maybe more in the future? */
 };
 
-static decl_subsys(vars, &efivar_ktype, NULL);
-static decl_subsys(efi, NULL, NULL);
+static decl_subsys(vars, NULL);
+static decl_subsys(efi, NULL);
 
 /*
  * efivar_create_sysfs_entry()
@@ -629,7 +629,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
         efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
 
         kobject_set_name(&new_efivar->kobj, "%s", short_name);
-        kobj_set_kset_s(new_efivar, vars_subsys);
+        new_efivar->kobj.kset = &vars_subsys;
+        new_efivar->kobj.ktype = &efivar_ktype;
         i = kobject_register(&new_efivar->kobj);
         if (i) {
                 kfree(short_name);
@@ -687,7 +688,7 @@ efivars_init(void)
                 goto out_free;
         }
 
-        kobj_set_kset_s(&vars_subsys, efi_subsys);
+        vars_subsys.kobj.kset = &efi_subsys;
 
         error = subsystem_register(&vars_subsys);
 
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;
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 01c351c176ac..ce1cff0fdeca 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -96,7 +96,7 @@ static struct kobj_type hotplug_slot_ktype = {
         .release = &hotplug_slot_release,
 };
 
-decl_subsys_name(pci_hotplug_slots, slots, &hotplug_slot_ktype, NULL);
+decl_subsys_name(pci_hotplug_slots, slots, NULL);
 
 /* these strings match up with the values in pci_bus_speed */
 static char *pci_bus_speed_strings[] = {
@@ -633,7 +633,8 @@ int pci_hp_register (struct hotplug_slot *slot)
         }
 
         kobject_set_name(&slot->kobj, "%s", slot->name);
-        kobj_set_kset_s(slot, pci_hotplug_slots_subsys);
+        slot->kobj.kset = &pci_hotplug_slots_subsys;
+        slot->kobj.ktype = &hotplug_slot_ktype;
 
         /* this can fail if we have already registered a slot with the same name */
         if (kobject_register(&slot->kobj)) {
@@ -701,7 +702,7 @@ static int __init pci_hotplug_init (void)
 {
         int result;
 
-        kobj_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
+        pci_hotplug_slots_subsys.kobj.kset = &pci_bus_type.subsys;
         result = subsystem_register(&pci_hotplug_slots_subsys);
         if (result) {
                 err("Register subsys with error %d\n", result);
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index a080fedf0332..76090937c758 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -131,7 +131,6 @@ struct kobj_type ktype_dlpar_io = {
 struct kset dlpar_io_kset = {
         .kobj = {.ktype = &ktype_dlpar_io,
                  .parent = &pci_hotplug_slots_subsys.kobj},
-        .ktype = &ktype_dlpar_io,
 };
 
 int dlpar_sysfs_init(void)
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 865f32b63b5c..606aae7490ab 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -160,7 +160,7 @@ static int uio_dev_add_attributes(struct uio_device *idev)
                 if (!map_found) {
                         map_found = 1;
                         kobject_set_name(&idev->map_attr_kset.kobj,"maps");
-                        idev->map_attr_kset.ktype = &map_attr_type;
+                        idev->map_attr_kset.kobj.ktype = &map_attr_type;
                         idev->map_attr_kset.kobj.parent = &idev->dev->kobj;
                         ret = kset_register(&idev->map_attr_kset);
                         if (ret)