15 files changed, 105 insertions, 107 deletions

diff --git a/drivers/base/base.h b/drivers/base/base.h
index d597f2659b23..5512d84452f2 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -45,3 +45,5 @@ struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)
 extern char *make_class_name(const char *name, struct kobject *kobj);
 
 extern void devres_release_all(struct device *dev);
+
+extern struct kset devices_subsys;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 1d76e2349654..dca734819e50 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -17,7 +17,7 @@
 #include "power/power.h"
 
 #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
-#define to_bus(obj) container_of(obj, struct bus_type, subsys.kset.kobj)
+#define to_bus(obj) container_of(obj, struct bus_type, subsys.kobj)
 
 /*
  * sysfs bindings for drivers
@@ -123,7 +123,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 {
         int error;
         if (get_bus(bus)) {
-                error = sysfs_create_file(&bus->subsys.kset.kobj, &attr->attr);
+                error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);
                 put_bus(bus);
         } else
                 error = -EINVAL;
@@ -133,7 +133,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)
 {
         if (get_bus(bus)) {
-                sysfs_remove_file(&bus->subsys.kset.kobj, &attr->attr);
+                sysfs_remove_file(&bus->subsys.kobj, &attr->attr);
                 put_bus(bus);
         }
 }
@@ -397,7 +397,7 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)
 static int make_deprecated_bus_links(struct device *dev)
 {
         return sysfs_create_link(&dev->kobj,
-                                 &dev->bus->subsys.kset.kobj, "bus");
+                                 &dev->bus->subsys.kobj, "bus");
 }
 
 static void remove_deprecated_bus_links(struct device *dev)
@@ -431,7 +431,7 @@ int bus_add_device(struct device * dev)
                 if (error)
                         goto out_id;
                 error = sysfs_create_link(&dev->kobj,
-                                &dev->bus->subsys.kset.kobj, "subsystem");
+                                &dev->bus->subsys.kobj, "subsystem");
                 if (error)
                         goto out_subsys;
                 error = make_deprecated_bus_links(dev);
@@ -810,7 +810,7 @@ int bus_register(struct bus_type * bus)
 
         BLOCKING_INIT_NOTIFIER_HEAD(&bus->bus_notifier);
 
-        retval = kobject_set_name(&bus->subsys.kset.kobj, "%s", bus->name);
+        retval = kobject_set_name(&bus->subsys.kobj, "%s", bus->name);
         if (retval)
                 goto out;
 
@@ -820,13 +820,13 @@ int bus_register(struct bus_type * bus)
                 goto out;
 
         kobject_set_name(&bus->devices.kobj, "devices");
-        bus->devices.subsys = &bus->subsys;
+        bus->devices.kobj.parent = &bus->subsys.kobj;
         retval = kset_register(&bus->devices);
         if (retval)
                 goto bus_devices_fail;
 
         kobject_set_name(&bus->drivers.kobj, "drivers");
-        bus->drivers.subsys = &bus->subsys;
+        bus->drivers.kobj.parent = &bus->subsys.kobj;
         bus->drivers.ktype = &ktype_driver;
         retval = kset_register(&bus->drivers);
         if (retval)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 80bbb2074636..20c4ea6eb50d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -19,10 +19,8 @@
 #include <linux/slab.h>
 #include "base.h"
 
-extern struct subsystem devices_subsys;
-
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
-#define to_class(obj) container_of(obj, struct class, subsys.kset.kobj)
+#define to_class(obj) container_of(obj, struct class, subsys.kobj)
 
 static ssize_t
 class_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
@@ -80,7 +78,7 @@ int class_create_file(struct class * cls, const struct class_attribute * attr)
 {
         int error;
         if (cls) {
-                error = sysfs_create_file(&cls->subsys.kset.kobj, &attr->attr);
+                error = sysfs_create_file(&cls->subsys.kobj, &attr->attr);
         } else
                 error = -EINVAL;
         return error;
@@ -89,7 +87,7 @@ int class_create_file(struct class * cls, const struct class_attribute * attr)
 void class_remove_file(struct class * cls, const struct class_attribute * attr)
 {
         if (cls)
-                sysfs_remove_file(&cls->subsys.kset.kobj, &attr->attr);
+                sysfs_remove_file(&cls->subsys.kobj, &attr->attr);
 }
 
 static struct class *class_get(struct class *cls)
@@ -147,7 +145,7 @@ int class_register(struct class * cls)
         INIT_LIST_HEAD(&cls->interfaces);
         kset_init(&cls->class_dirs);
         init_MUTEX(&cls->sem);
-        error = kobject_set_name(&cls->subsys.kset.kobj, "%s", cls->name);
+        error = kobject_set_name(&cls->subsys.kobj, "%s", cls->name);
         if (error)
                 return error;
 
@@ -611,7 +609,7 @@ int class_device_add(struct class_device *class_dev)
         if (parent_class_dev)
                 class_dev->kobj.parent = &parent_class_dev->kobj;
         else
-                class_dev->kobj.parent = &parent_class->subsys.kset.kobj;
+                class_dev->kobj.parent = &parent_class->subsys.kobj;
 
         error = kobject_add(&class_dev->kobj);
         if (error)
@@ -619,7 +617,7 @@ int class_device_add(struct class_device *class_dev)
 
         /* add the needed attributes to this device */
         error = sysfs_create_link(&class_dev->kobj,
-                                  &parent_class->subsys.kset.kobj, "subsystem");
+                                  &parent_class->subsys.kobj, "subsystem");
         if (error)
                 goto out3;
         class_dev->uevent_attr.attr.name = "uevent";
@@ -917,8 +915,8 @@ int __init classes_init(void)
         /* ick, this is ugly, the things we go through to keep from showing up
          * in sysfs... */
         subsystem_init(&class_obj_subsys);
-        if (!class_obj_subsys.kset.subsys)
-                        class_obj_subsys.kset.subsys = &class_obj_subsys;
+        if (!class_obj_subsys.kobj.parent)
+                class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
         return 0;
 }
 
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 59d9816c332e..b78fc1e68264 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -565,7 +565,7 @@ static struct kobject * get_device_parent(struct device *dev,
         /* Set the parent to the class, not the parent device */
         /* this keeps sysfs from having a symlink to make old udevs happy */
         if (dev->class)
-                return &dev->class->subsys.kset.kobj;
+                return &dev->class->subsys.kobj;
         else if (parent)
                 return &parent->kobj;
 
@@ -577,7 +577,7 @@ static struct kobject *virtual_device_parent(struct device *dev)
         static struct kobject *virtual_dir = NULL;
 
         if (!virtual_dir)
-                virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");
+                virtual_dir = kobject_add_dir(&devices_subsys.kobj, "virtual");
 
         return virtual_dir;
 }
@@ -711,12 +711,12 @@ int device_add(struct device *dev)
         }
 
         if (dev->class) {
-                sysfs_create_link(&dev->kobj, &dev->class->subsys.kset.kobj,
+                sysfs_create_link(&dev->kobj, &dev->class->subsys.kobj,
                                   "subsystem");
                 /* If this is not a "fake" compatible device, then create the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_create_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_create_link(&dev->class->subsys.kobj,
                                           &dev->kobj, dev->bus_id);
                 if (parent) {
                         sysfs_create_link(&dev->kobj, &dev->parent->kobj,
@@ -774,8 +774,8 @@ int device_add(struct device *dev)
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 /* If this is not a "fake" compatible device, remove the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kobj,
                                           dev->bus_id);
                 if (parent) {
 #ifdef CONFIG_SYSFS_DEPRECATED
@@ -875,8 +875,8 @@ void device_del(struct device * dev)
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 /* If this is not a "fake" compatible device, remove the
                  * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
-                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                if (dev->kobj.parent != &dev->class->subsys.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kobj,
                                           dev->bus_id);
                 if (parent) {
 #ifdef CONFIG_SYSFS_DEPRECATED
@@ -1192,9 +1192,9 @@ int device_rename(struct device *dev, char *new_name)
 #endif
 
         if (dev->class) {
-                sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                sysfs_remove_link(&dev->class->subsys.kobj,
                                   old_symlink_name);
-                sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
+                sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
                                   dev->bus_id);
         }
         put_device(dev);
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index cb1b98ae0d58..90c862932169 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -17,13 +17,13 @@
 
 static decl_subsys(firmware, NULL, NULL);
 
-int firmware_register(struct subsystem * s)
+int firmware_register(struct kset *s)
 {
-        kset_set_kset_s(s, firmware_subsys);
+        kobj_set_kset_s(s, firmware_subsys);
         return subsystem_register(s);
 }
 
-void firmware_unregister(struct subsystem * s)
+void firmware_unregister(struct kset *s)
 {
         subsystem_unregister(s);
 }
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index 58b6f77a1b34..a47ee1b70d20 100644
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -16,8 +16,6 @@
 
 #define to_dev(node) container_of(node, struct device, kobj.entry)
 
-extern struct subsystem devices_subsys;
-
 
 /**
  * We handle system devices differently - we suspend and shut them
@@ -36,7 +34,7 @@ void device_shutdown(void)
 {
         struct device * dev, *devn;
 
-        list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.kset.list,
+        list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list,
                                 kobj.entry) {
                 if (dev->bus && dev->bus->shutdown) {
                         dev_dbg(dev, "shutdown\n");
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 04e5db445c74..29f1291966c1 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -25,7 +25,7 @@
 
 #include "base.h"
 
-extern struct subsystem devices_subsys;
+extern struct kset devices_subsys;
 
 #define to_sysdev(k) container_of(k, struct sys_device, kobj)
 #define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)
@@ -138,7 +138,7 @@ int sysdev_class_register(struct sysdev_class * cls)
         pr_debug("Registering sysdev class '%s'\n",
                  kobject_name(&cls->kset.kobj));
         INIT_LIST_HEAD(&cls->drivers);
-        cls->kset.subsys = &system_subsys;
+        cls->kset.kobj.parent = &system_subsys.kobj;
         kset_set_kset_s(cls, system_subsys);
         return kset_register(&cls->kset);
 }
@@ -309,7 +309,7 @@ void sysdev_shutdown(void)
         pr_debug("Shutting Down System Devices\n");
 
         down(&sysdev_drivers_lock);
-        list_for_each_entry_reverse(cls, &system_subsys.kset.list,
+        list_for_each_entry_reverse(cls, &system_subsys.list,
                                     kset.kobj.entry) {
                 struct sys_device * sysdev;
 
@@ -384,7 +384,7 @@ int sysdev_suspend(pm_message_t state)
 
         pr_debug("Suspending System Devices\n");
 
-        list_for_each_entry_reverse(cls, &system_subsys.kset.list,
+        list_for_each_entry_reverse(cls, &system_subsys.list,
                                     kset.kobj.entry) {
 
                 pr_debug("Suspending type '%s':\n",
@@ -457,7 +457,7 @@ gbl_driver:
         }
 
         /* resume other classes */
-        list_for_each_entry_continue(cls, &system_subsys.kset.list,
+        list_for_each_entry_continue(cls, &system_subsys.list,
                                         kset.kobj.entry) {
                 list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
                         pr_debug(" %s\n", kobject_name(&err_dev->kobj));
@@ -483,7 +483,7 @@ int sysdev_resume(void)
 
         pr_debug("Resuming System Devices\n");
 
-        list_for_each_entry(cls, &system_subsys.kset.list, kset.kobj.entry) {
+        list_for_each_entry(cls, &system_subsys.list, kset.kobj.entry) {
                 struct sys_device * sysdev;
 
                 pr_debug("Resuming type '%s':\n",
@@ -501,7 +501,7 @@ int sysdev_resume(void)
 
 int __init system_bus_init(void)
 {
-        system_subsys.kset.kobj.parent = &devices_subsys.kset.kobj;
+        system_subsys.kobj.parent = &devices_subsys.kobj;
         return subsystem_register(&system_subsys);
 }
 
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index c6281ccd4fe7..1324984a4c35 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -409,7 +409,7 @@ static struct kobj_type ktype_efivar = {
 };
 
 static ssize_t
-dummy(struct subsystem *sub, char *buf)
+dummy(struct kset *kset, char *buf)
 {
         return -ENODEV;
 }
@@ -422,7 +422,7 @@ efivar_unregister(struct efivar_entry *var)
 
 
 static ssize_t
-efivar_create(struct subsystem *sub, const char *buf, size_t count)
+efivar_create(struct kset *kset, const char *buf, size_t count)
 {
         struct efi_variable *new_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -480,7 +480,7 @@ efivar_create(struct subsystem *sub, const char *buf, size_t count)
 }
 
 static ssize_t
-efivar_delete(struct subsystem *sub, const char *buf, size_t count)
+efivar_delete(struct kset *kset, const char *buf, size_t count)
 {
         struct efi_variable *del_var = (struct efi_variable *)buf;
         struct efivar_entry *search_efivar, *n;
@@ -551,11 +551,11 @@ static struct subsys_attribute *var_subsys_attrs[] = {
  * the efivars driver
  */
 static ssize_t
-systab_read(struct subsystem *entry, char *buf)
+systab_read(struct kset *kset, char *buf)
 {
         char *str = buf;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         if (efi.mps != EFI_INVALID_TABLE_ADDR)
@@ -687,7 +687,7 @@ efivars_init(void)
                 goto out_free;
         }
 
-        kset_set_kset_s(&vars_subsys, efi_subsys);
+        kobj_set_kset_s(&vars_subsys, efi_subsys);
 
         error = subsystem_register(&vars_subsys);
 
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 6439f378f6cc..6e55b2c5874e 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -650,7 +650,7 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
                         dev->cdev.dev, evdev->name);
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+        sysfs_create_link(&input_class.subsys.kobj, &cdev->kobj,
                           evdev->name);
 
         return &evdev->handle;
@@ -661,7 +661,7 @@ static void evdev_disconnect(struct input_handle *handle)
         struct evdev *evdev = handle->private;
         struct evdev_list *list;
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, evdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
         evdev->exist = 0;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 9f3529ad3fda..d2482e4f71be 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -539,7 +539,7 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
                         dev->cdev.dev, joydev->name);
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+        sysfs_create_link(&input_class.subsys.kobj, &cdev->kobj,
                           joydev->name);
 
         return &joydev->handle;
@@ -550,7 +550,7 @@ static void joydev_disconnect(struct input_handle *handle)
         struct joydev *joydev = handle->private;
         struct joydev_list *list;
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, joydev->name);
         class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
         joydev->exist = 0;
 
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 664bcc8116fc..074fee429d1b 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -661,7 +661,7 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru
                         dev->cdev.dev, mousedev->name);
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+        sysfs_create_link(&input_class.subsys.kobj, &cdev->kobj,
                           mousedev->name);
 
         return &mousedev->handle;
@@ -672,7 +672,7 @@ static void mousedev_disconnect(struct input_handle *handle)
         struct mousedev *mousedev = handle->private;
         struct mousedev_list *list;
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, mousedev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
         mousedev->exist = 0;
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 0300dca8591d..05dfc10bc079 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -420,7 +420,7 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
                         dev->cdev.dev, tsdev->name);
 
         /* temporary symlink to keep userspace happy */
-        sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,
+        sysfs_create_link(&input_class.subsys.kobj, &cdev->kobj,
                           tsdev->name);
 
         return &tsdev->handle;
@@ -431,7 +431,7 @@ static void tsdev_disconnect(struct input_handle *handle)
         struct tsdev *tsdev = handle->private;
         struct tsdev_list *list;
 
-        sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);
+        sysfs_remove_link(&input_class.subsys.kobj, tsdev->name);
         class_device_destroy(&input_class,
                         MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
         tsdev->exist = 0;
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index ea1b7a63598e..815e445c3125 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -520,17 +520,17 @@ static struct pdcspath_entry *pdcspath_entries[] = {
 
 /**
  * pdcs_size_read - Stable Storage size output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static ssize_t
-pdcs_size_read(struct subsystem *entry, char *buf)
+pdcs_size_read(struct kset *kset, char *buf)
 {
         char *out = buf;
-        
-        if (!entry || !buf)
+
+        if (!kset || !buf)
                 return -EINVAL;
-                
+
         /* show the size of the stable storage */
         out += sprintf(out, "%ld\n", pdcs_size);
 
@@ -539,17 +539,17 @@ pdcs_size_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_auto_read - Stable Storage autoboot/search flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
  */
 static ssize_t
-pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
+pdcs_auto_read(struct kset *kset, char *buf, int knob)
 {
         char *out = buf;
         struct pdcspath_entry *pathentry;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* Current flags are stored in primary boot path entry */
@@ -565,40 +565,40 @@ pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
 
 /**
  * pdcs_autoboot_read - Stable Storage autoboot flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static inline ssize_t
-pdcs_autoboot_read(struct subsystem *entry, char *buf)
+pdcs_autoboot_read(struct kset *kset, char *buf)
 {
-        return pdcs_auto_read(entry, buf, PF_AUTOBOOT);
+        return pdcs_auto_read(kset, buf, PF_AUTOBOOT);
 }
 
 /**
  * pdcs_autosearch_read - Stable Storage autoboot flag output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static inline ssize_t
-pdcs_autosearch_read(struct subsystem *entry, char *buf)
+pdcs_autosearch_read(struct kset *kset, char *buf)
 {
-        return pdcs_auto_read(entry, buf, PF_AUTOSEARCH);
+        return pdcs_auto_read(kset, buf, PF_AUTOSEARCH);
 }
 
 /**
  * pdcs_timer_read - Stable Storage timer count output (in seconds).
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * The value of the timer field correponds to a number of seconds in powers of 2.
  */
 static ssize_t
-pdcs_timer_read(struct subsystem *entry, char *buf)
+pdcs_timer_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         struct pdcspath_entry *pathentry;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* Current flags are stored in primary boot path entry */
@@ -615,15 +615,15 @@ pdcs_timer_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osid_read - Stable Storage OS ID register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  */
 static ssize_t
-pdcs_osid_read(struct subsystem *entry, char *buf)
+pdcs_osid_read(struct kset *kset, char *buf)
 {
         char *out = buf;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         out += sprintf(out, "%s dependent data (0x%.4x)\n",
@@ -634,18 +634,18 @@ pdcs_osid_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osdep1_read - Stable Storage OS-Dependent data area 1 output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This can hold 16 bytes of OS-Dependent data.
  */
 static ssize_t
-pdcs_osdep1_read(struct subsystem *entry, char *buf)
+pdcs_osdep1_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result[4];
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         if (pdc_stable_read(PDCS_ADDR_OSD1, &result, sizeof(result)) != PDC_OK)
@@ -661,18 +661,18 @@ pdcs_osdep1_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_diagnostic_read - Stable Storage Diagnostic register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * I have NFC how to interpret the content of that register ;-).
  */
 static ssize_t
-pdcs_diagnostic_read(struct subsystem *entry, char *buf)
+pdcs_diagnostic_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* get diagnostic */
@@ -686,18 +686,18 @@ pdcs_diagnostic_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_fastsize_read - Stable Storage FastSize register output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This register holds the amount of system RAM to be tested during boot sequence.
  */
 static ssize_t
-pdcs_fastsize_read(struct subsystem *entry, char *buf)
+pdcs_fastsize_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         u32 result;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         /* get fast-size */
@@ -715,13 +715,13 @@ pdcs_fastsize_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_osdep2_read - Stable Storage OS-Dependent data area 2 output.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The output buffer to write to.
  *
  * This can hold pdcs_size - 224 bytes of OS-Dependent data, when available.
  */
 static ssize_t
-pdcs_osdep2_read(struct subsystem *entry, char *buf)
+pdcs_osdep2_read(struct kset *kset, char *buf)
 {
         char *out = buf;
         unsigned long size;
@@ -733,7 +733,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
 
         size = pdcs_size - 224;
 
-        if (!entry || !buf)
+        if (!kset || !buf)
                 return -EINVAL;
 
         for (i=0; i<size; i+=4) {
@@ -748,7 +748,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
 
 /**
  * pdcs_auto_write - This function handles autoboot/search flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
@@ -758,7 +758,7 @@ pdcs_osdep2_read(struct subsystem *entry, char *buf)
  *      \"n\" (n == 0 or 1) to toggle AutoBoot Off or On
  */
 static ssize_t
-pdcs_auto_write(struct subsystem *entry, const char *buf, size_t count, int knob)
+pdcs_auto_write(struct kset *kset, const char *buf, size_t count, int knob)
 {
         struct pdcspath_entry *pathentry;
         unsigned char flags;
@@ -768,7 +768,7 @@ pdcs_auto_write(struct subsystem *entry, const char *buf, size_t count, int knob
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         /* We'll use a local copy of buf */
@@ -823,7 +823,7 @@ parse_error:
 
 /**
  * pdcs_autoboot_write - This function handles autoboot flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -832,14 +832,14 @@ parse_error:
  *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
  */
 static inline ssize_t
-pdcs_autoboot_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_autoboot_write(struct kset *kset, const char *buf, size_t count)
 {
-        return pdcs_auto_write(entry, buf, count, PF_AUTOBOOT);
+        return pdcs_auto_write(kset, buf, count, PF_AUTOBOOT);
 }
 
 /**
  * pdcs_autosearch_write - This function handles autosearch flag modifying.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -848,14 +848,14 @@ pdcs_autoboot_write(struct subsystem *entry, const char *buf, size_t count)
  *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
  */
 static inline ssize_t
-pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_autosearch_write(struct kset *kset, const char *buf, size_t count)
 {
-        return pdcs_auto_write(entry, buf, count, PF_AUTOSEARCH);
+        return pdcs_auto_write(kset, buf, count, PF_AUTOSEARCH);
 }
 
 /**
  * pdcs_osdep1_write - Stable Storage OS-Dependent data area 1 input.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -864,14 +864,14 @@ pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)
  * its input buffer.
  */
 static ssize_t
-pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_osdep1_write(struct kset *kset, const char *buf, size_t count)
 {
         u8 in[16];
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         if (unlikely(pdcs_osid != OS_ID_LINUX))
@@ -892,7 +892,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
 
 /**
  * pdcs_osdep2_write - Stable Storage OS-Dependent data area 2 input.
- * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @kset: An allocated and populated struct kset. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
  *
@@ -901,7 +901,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
  * constructing its input buffer.
  */
 static ssize_t
-pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_osdep2_write(struct kset *kset, const char *buf, size_t count)
 {
         unsigned long size;
         unsigned short i;
@@ -910,7 +910,7 @@ pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
 
-        if (!entry || !buf || !count)
+        if (!kset || !buf || !count)
                 return -EINVAL;
 
         if (unlikely(pdcs_size <= 224))
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 7f03881a8b68..e7322c25d377 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -424,7 +424,7 @@ static int __init ibm_acpiphp_init(void)
         int retval = 0;
         acpi_status status;
         struct acpi_device *device;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
 
         dbg("%s\n", __FUNCTION__);
 
@@ -471,7 +471,7 @@ init_return:
 static void __exit ibm_acpiphp_exit(void)
 {
         acpi_status status;
-        struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+        struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;
 
         dbg("%s\n", __FUNCTION__);
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index f5d632e72323..63f3bd1eecc4 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -62,7 +62,7 @@ static int debug;
 
 static LIST_HEAD(pci_hotplug_slot_list);
 
-struct subsystem pci_hotplug_slots_subsys;
+struct kset pci_hotplug_slots_subsys;
 
 static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
                 struct attribute *attr, char *buf)
@@ -764,7 +764,7 @@ static int __init pci_hotplug_init (void)
 {
         int result;
 
-        kset_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
+        kobj_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
         result = subsystem_register(&pci_hotplug_slots_subsys);
         if (result) {
                 err("Register subsys with error %d\n", result);