Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

This can be broken down into these major areas:
 - Documentation updates (language translations and fixes, as
   well as kobject and kset documenatation updates.)
 - major kset/kobject/ktype rework and fixes.  This cleans up the
   kset and kobject and ktype relationship and architecture,
   making sense of things now, and good documenation and samples
   are provided for others to use.  Also the attributes for
   kobjects are much easier to handle now.  This cleaned up a LOT
   of code all through the kernel, making kobjects easier to use
   if you want to.
 - struct bus_type has been reworked to now handle the lifetime
   rules properly, as the kobject is properly dynamic.
 - struct driver has also been reworked, and now the lifetime
   issues are resolved.
 - the block subsystem has been converted to use struct device
   now, and not "raw" kobjects.  This patch has been in the -mm
   tree for over a year now, and finally all the issues are
   worked out with it.  Older distros now properly work with new
   kernels, and no userspace updates are needed at all.
 - nozomi driver is added.  This has also been in -mm for a long
   time, and many people have asked for it to go in.  It is now
   in good enough shape to do so.
 - lots of class_device conversions to use struct device instead.
   The tree is almost all cleaned up now, only SCSI and IB is the
   remaining code to fix up...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (196 commits)
  Driver core: coding style fixes
  Kobject: fix coding style issues in kobject c files
  Kobject: fix coding style issues in kobject.h
  Driver core: fix coding style issues in device.h
  spi: use class iteration api
  scsi: use class iteration api
  rtc: use class iteration api
  power supply : use class iteration api
  ieee1394: use class iteration api
  Driver Core: add class iteration api
  Driver core: Cleanup get_device_parent() in device_add() and device_move()
  UIO: constify function pointer tables
  Driver Core: constify the name passed to platform_device_register_simple
  driver core: fix build with SYSFS=n
  sysfs: make SYSFS_DEPRECATED depend on SYSFS
  Driver core: use LIST_HEAD instead of call to INIT_LIST_HEAD in __init
  kobject: add sample code for how to use ksets/ktypes/kobjects
  kobject: add sample code for how to use kobjects in a simple manner.
  kobject: update the kobject/kset documentation
  kobject: remove old, outdated documentation.
  ...

10 files changed, 163 insertions, 251 deletions

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 65daa5373ca6..e53bc30e9ba5 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -17,30 +17,34 @@
 #include <linux/sched.h>
 
 #define KERNEL_ATTR_RO(_name) \
-static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
+static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 
 #define KERNEL_ATTR_RW(_name) \
-static struct subsys_attribute _name##_attr = \
+static struct kobj_attribute _name##_attr = \
         __ATTR(_name, 0644, _name##_show, _name##_store)
 
 #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
 /* current uevent sequence number */
-static ssize_t uevent_seqnum_show(struct kset *kset, char *page)
+static ssize_t uevent_seqnum_show(struct kobject *kobj,
+                                  struct kobj_attribute *attr, char *buf)
 {
-        return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
+        return sprintf(buf, "%llu\n", (unsigned long long)uevent_seqnum);
 }
 KERNEL_ATTR_RO(uevent_seqnum);
 
 /* uevent helper program, used during early boo */
-static ssize_t uevent_helper_show(struct kset *kset, char *page)
+static ssize_t uevent_helper_show(struct kobject *kobj,
+                                  struct kobj_attribute *attr, char *buf)
 {
-        return sprintf(page, "%s\n", uevent_helper);
+        return sprintf(buf, "%s\n", uevent_helper);
 }
-static ssize_t uevent_helper_store(struct kset *kset, const char *page, size_t count)
+static ssize_t uevent_helper_store(struct kobject *kobj,
+                                   struct kobj_attribute *attr,
+                                   const char *buf, size_t count)
 {
         if (count+1 > UEVENT_HELPER_PATH_LEN)
                 return -ENOENT;
-        memcpy(uevent_helper, page, count);
+        memcpy(uevent_helper, buf, count);
         uevent_helper[count] = '\0';
         if (count && uevent_helper[count-1] == '\n')
                 uevent_helper[count-1] = '\0';
@@ -50,21 +54,24 @@ KERNEL_ATTR_RW(uevent_helper);
 #endif
 
 #ifdef CONFIG_KEXEC
-static ssize_t kexec_loaded_show(struct kset *kset, char *page)
+static ssize_t kexec_loaded_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr, char *buf)
 {
-        return sprintf(page, "%d\n", !!kexec_image);
+        return sprintf(buf, "%d\n", !!kexec_image);
 }
 KERNEL_ATTR_RO(kexec_loaded);
 
-static ssize_t kexec_crash_loaded_show(struct kset *kset, char *page)
+static ssize_t kexec_crash_loaded_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *buf)
 {
-        return sprintf(page, "%d\n", !!kexec_crash_image);
+        return sprintf(buf, "%d\n", !!kexec_crash_image);
 }
 KERNEL_ATTR_RO(kexec_crash_loaded);
 
-static ssize_t vmcoreinfo_show(struct kset *kset, char *page)
+static ssize_t vmcoreinfo_show(struct kobject *kobj,
+                               struct kobj_attribute *attr, char *buf)
 {
-        return sprintf(page, "%lx %x\n",
+        return sprintf(buf, "%lx %x\n",
                        paddr_vmcoreinfo_note(),
                        (unsigned int)vmcoreinfo_max_size);
 }
@@ -94,8 +101,8 @@ static struct bin_attribute notes_attr = {
         .read = &notes_read,
 };
 
-decl_subsys(kernel, NULL, NULL);
-EXPORT_SYMBOL_GPL(kernel_subsys);
+struct kobject *kernel_kobj;
+EXPORT_SYMBOL_GPL(kernel_kobj);
 
 static struct attribute * kernel_attrs[] = {
 #if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
@@ -116,24 +123,39 @@ static struct attribute_group kernel_attr_group = {
 
 static int __init ksysfs_init(void)
 {
-        int error = subsystem_register(&kernel_subsys);
-        if (!error)
-                error = sysfs_create_group(&kernel_subsys.kobj,
-                                           &kernel_attr_group);
+        int error;
 
-        if (!error && notes_size > 0) {
-                notes_attr.size = notes_size;
-                error = sysfs_create_bin_file(&kernel_subsys.kobj,
-                                              &notes_attr);
+        kernel_kobj = kobject_create_and_add("kernel", NULL);
+        if (!kernel_kobj) {
+                error = -ENOMEM;
+                goto exit;
         }
+        error = sysfs_create_group(kernel_kobj, &kernel_attr_group);
+        if (error)
+                goto kset_exit;
 
-        /*
-         * Create "/sys/kernel/uids" directory and corresponding root user's
-         * directory under it.
-         */
-        if (!error)
-                error = uids_kobject_init();
+        if (notes_size > 0) {
+                notes_attr.size = notes_size;
+                error = sysfs_create_bin_file(kernel_kobj, &notes_attr);
+                if (error)
+                        goto group_exit;
+        }
 
+        /* create the /sys/kernel/uids/ directory */
+        error = uids_sysfs_init();
+        if (error)
+                goto notes_exit;
+
+        return 0;
+
+notes_exit:
+        if (notes_size > 0)
+                sysfs_remove_bin_file(kernel_kobj, &notes_attr);
+group_exit:
+        sysfs_remove_group(kernel_kobj, &kernel_attr_group);
+kset_exit:
+        kobject_put(kernel_kobj);
+exit:
         return error;
 }
 
diff --git a/kernel/module.c b/kernel/module.c
index c2e3e2e98801..dcb8a2cbf75e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -47,8 +47,6 @@
 #include <asm/cacheflush.h>
 #include <linux/license.h>
 
-extern int module_sysfs_initialized;
-
 #if 0
 #define DEBUGP printk
 #else
@@ -1122,7 +1120,7 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
                 ++loaded;
         }
 
-        notes_attrs->dir = kobject_add_dir(&mod->mkobj.kobj, "notes");
+        notes_attrs->dir = kobject_create_and_add("notes", &mod->mkobj.kobj);
         if (!notes_attrs->dir)
                 goto out;
 
@@ -1219,15 +1217,16 @@ int mod_sysfs_init(struct module *mod)
                 err = -EINVAL;
                 goto out;
         }
-        memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
-        err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
-        if (err)
-                goto out;
-        kobj_set_kset_s(&mod->mkobj, module_subsys);
         mod->mkobj.mod = mod;
 
-        kobject_init(&mod->mkobj.kobj);
+        memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
+        mod->mkobj.kobj.kset = module_kset;
+        err = kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL,
+                                   "%s", mod->name);
+        if (err)
+                kobject_put(&mod->mkobj.kobj);
 
+        /* delay uevent until full sysfs population */
 out:
         return err;
 }
@@ -1238,12 +1237,7 @@ int mod_sysfs_setup(struct module *mod,
 {
         int err;
 
-        /* delay uevent until full sysfs population */
-        err = kobject_add(&mod->mkobj.kobj);
-        if (err)
-                goto out;
-
-        mod->holders_dir = kobject_add_dir(&mod->mkobj.kobj, "holders");
+        mod->holders_dir = kobject_create_and_add("holders", &mod->mkobj.kobj);
         if (!mod->holders_dir) {
                 err = -ENOMEM;
                 goto out_unreg;
@@ -1263,11 +1257,9 @@ int mod_sysfs_setup(struct module *mod,
 out_unreg_param:
         module_param_sysfs_remove(mod);
 out_unreg_holders:
-        kobject_unregister(mod->holders_dir);
+        kobject_put(mod->holders_dir);
 out_unreg:
-        kobject_del(&mod->mkobj.kobj);
         kobject_put(&mod->mkobj.kobj);
-out:
         return err;
 }
 #endif
@@ -1276,9 +1268,9 @@ static void mod_kobject_remove(struct module *mod)
 {
         module_remove_modinfo_attrs(mod);
         module_param_sysfs_remove(mod);
-        kobject_unregister(mod->mkobj.drivers_dir);
-        kobject_unregister(mod->holders_dir);
-        kobject_unregister(&mod->mkobj.kobj);
+        kobject_put(mod->mkobj.drivers_dir);
+        kobject_put(mod->holders_dir);
+        kobject_put(&mod->mkobj.kobj);
 }
 
 /*
@@ -1884,10 +1876,10 @@ static struct module *load_module(void __user *umod,
         /* Now we've moved module, initialize linked lists, etc. */
         module_unload_init(mod);
 
-        /* Initialize kobject, so we can reference it. */
+        /* add kobject, so we can reference it. */
         err = mod_sysfs_init(mod);
         if (err)
-                goto cleanup;
+                goto free_unload;
 
         /* Set up license info based on the info section */
         set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
@@ -2057,6 +2049,9 @@ static struct module *load_module(void __user *umod,
  arch_cleanup:
         module_arch_cleanup(mod);
  cleanup:
+        kobject_del(&mod->mkobj.kobj);
+        kobject_put(&mod->mkobj.kobj);
+ free_unload:
         module_unload_free(mod);
         module_free(mod, mod->module_init);
  free_core:
@@ -2502,93 +2497,6 @@ void print_modules(void)
         printk("\n");
 }
 
-#ifdef CONFIG_SYSFS
-static char *make_driver_name(struct device_driver *drv)
-{
-        char *driver_name;
-
-        driver_name = kmalloc(strlen(drv->name) + strlen(drv->bus->name) + 2,
-                              GFP_KERNEL);
-        if (!driver_name)
-                return NULL;
-
-        sprintf(driver_name, "%s:%s", drv->bus->name, drv->name);
-        return driver_name;
-}
-
-static void module_create_drivers_dir(struct module_kobject *mk)
-{
-        if (!mk || mk->drivers_dir)
-                return;
-
-        mk->drivers_dir = kobject_add_dir(&mk->kobj, "drivers");
-}
-
-void module_add_driver(struct module *mod, struct device_driver *drv)
-{
-        char *driver_name;
-        int no_warn;
-        struct module_kobject *mk = NULL;
-
-        if (!drv)
-                return;
-
-        if (mod)
-                mk = &mod->mkobj;
-        else if (drv->mod_name) {
-                struct kobject *mkobj;
-
-                /* Lookup built-in module entry in /sys/modules */
-                mkobj = kset_find_obj(&module_subsys, drv->mod_name);
-                if (mkobj) {
-                        mk = container_of(mkobj, struct module_kobject, kobj);
-                        /* remember our module structure */
-                        drv->mkobj = mk;
-                        /* kset_find_obj took a reference */
-                        kobject_put(mkobj);
-                }
-        }
-
-        if (!mk)
-                return;
-
-        /* Don't check return codes; these calls are idempotent */
-        no_warn = sysfs_create_link(&drv->kobj, &mk->kobj, "module");
-        driver_name = make_driver_name(drv);
-        if (driver_name) {
-                module_create_drivers_dir(mk);
-                no_warn = sysfs_create_link(mk->drivers_dir, &drv->kobj,
-                                            driver_name);
-                kfree(driver_name);
-        }
-}
-EXPORT_SYMBOL(module_add_driver);
-
-void module_remove_driver(struct device_driver *drv)
-{
-        struct module_kobject *mk = NULL;
-        char *driver_name;
-
-        if (!drv)
-                return;
-
-        sysfs_remove_link(&drv->kobj, "module");
-
-        if (drv->owner)
-                mk = &drv->owner->mkobj;
-        else if (drv->mkobj)
-                mk = drv->mkobj;
-        if (mk && mk->drivers_dir) {
-                driver_name = make_driver_name(drv);
-                if (driver_name) {
-                        sysfs_remove_link(mk->drivers_dir, driver_name);
-                        kfree(driver_name);
-                }
-        }
-}
-EXPORT_SYMBOL(module_remove_driver);
-#endif
-
 #ifdef CONFIG_MODVERSIONS
 /* Generate the signature for struct module here, too, for modversions. */
 void struct_module(struct module *mod) { return; }
diff --git a/kernel/params.c b/kernel/params.c
index 7686417ee00e..b4da9505f4d2 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -560,11 +560,10 @@ static void __init kernel_param_sysfs_setup(const char *name,
         BUG_ON(!mk);
 
         mk->mod = THIS_MODULE;
-        kobj_set_kset_s(mk, module_subsys);
-        kobject_set_name(&mk->kobj, name);
-        kobject_init(&mk->kobj);
-        ret = kobject_add(&mk->kobj);
+        mk->kobj.kset = module_kset;
+        ret = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, "%s", name);
         if (ret) {
+                kobject_put(&mk->kobj);
                 printk(KERN_ERR "Module '%s' failed to be added to sysfs, "
                       "error number %d\n", name, ret);
                 printk(KERN_ERR "The system will be unstable now.\n");
@@ -679,8 +678,6 @@ static struct sysfs_ops module_sysfs_ops = {
         .store = module_attr_store,
 };
 
-static struct kobj_type module_ktype;
-
 static int uevent_filter(struct kset *kset, struct kobject *kobj)
 {
         struct kobj_type *ktype = get_ktype(kobj);
@@ -694,21 +691,11 @@ static struct kset_uevent_ops module_uevent_ops = {
         .filter = uevent_filter,
 };
 
-decl_subsys(module, &module_ktype, &module_uevent_ops);
+struct kset *module_kset;
 int module_sysfs_initialized;
 
-static void module_release(struct kobject *kobj)
-{
-        /*
-         * Stupid empty release function to allow the memory for the kobject to
-         * be properly cleaned up.  This will not need to be present for 2.6.25
-         * with the upcoming kobject core rework.
-         */
-}
-
-static struct kobj_type module_ktype = {
+struct kobj_type module_ktype = {
         .sysfs_ops =    &module_sysfs_ops,
-        .release =      module_release,
 };
 
 /*
@@ -716,13 +703,11 @@ static struct kobj_type module_ktype = {
  */
 static int __init param_sysfs_init(void)
 {
-        int ret;
-
-        ret = subsystem_register(&module_subsys);
-        if (ret < 0) {
-                printk(KERN_WARNING "%s (%d): subsystem_register error: %d\n",
-                        __FILE__, __LINE__, ret);
-                return ret;
+        module_kset = kset_create_and_add("module", &module_uevent_ops, NULL);
+        if (!module_kset) {
+                printk(KERN_WARNING "%s (%d): error creating kset\n",
+                        __FILE__, __LINE__);
+                return -ENOMEM;
         }
         module_sysfs_initialized = 1;
 
@@ -732,14 +717,7 @@ static int __init param_sysfs_init(void)
 }
 subsys_initcall(param_sysfs_init);
 
-#else
-#if 0
-static struct sysfs_ops module_sysfs_ops = {
-        .show = NULL,
-        .store = NULL,
-};
-#endif
-#endif
+#endif /* CONFIG_SYSFS */
 
 EXPORT_SYMBOL(param_set_byte);
 EXPORT_SYMBOL(param_get_byte);
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 05b64790fe83..b138b431e271 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -567,7 +567,8 @@ static const char * const hibernation_modes[] = {
  *      supports it (as determined by having hibernation_ops).
  */
 
-static ssize_t disk_show(struct kset *kset, char *buf)
+static ssize_t disk_show(struct kobject *kobj, struct kobj_attribute *attr,
+                         char *buf)
 {
         int i;
         char *start = buf;
@@ -597,7 +598,8 @@ static ssize_t disk_show(struct kset *kset, char *buf)
 }
 
 
-static ssize_t disk_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t disk_store(struct kobject *kobj, struct kobj_attribute *attr,
+                          const char *buf, size_t n)
 {
         int error = 0;
         int i;
@@ -642,13 +644,15 @@ static ssize_t disk_store(struct kset *kset, const char *buf, size_t n)
 
 power_attr(disk);
 
-static ssize_t resume_show(struct kset *kset, char *buf)
+static ssize_t resume_show(struct kobject *kobj, struct kobj_attribute *attr,
+                           char *buf)
 {
         return sprintf(buf,"%d:%d\n", MAJOR(swsusp_resume_device),
                        MINOR(swsusp_resume_device));
 }
 
-static ssize_t resume_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr,
+                            const char *buf, size_t n)
 {
         unsigned int maj, min;
         dev_t res;
@@ -674,12 +678,14 @@ static ssize_t resume_store(struct kset *kset, const char *buf, size_t n)
 
 power_attr(resume);
 
-static ssize_t image_size_show(struct kset *kset, char *buf)
+static ssize_t image_size_show(struct kobject *kobj, struct kobj_attribute *attr,
+                               char *buf)
 {
         return sprintf(buf, "%lu\n", image_size);
 }
 
-static ssize_t image_size_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t image_size_store(struct kobject *kobj, struct kobj_attribute *attr,
+                                const char *buf, size_t n)
 {
         unsigned long size;
 
@@ -708,7 +714,7 @@ static struct attribute_group attr_group = {
 
 static int __init pm_disk_init(void)
 {
-        return sysfs_create_group(&power_subsys.kobj, &attr_group);
+        return sysfs_create_group(power_kobj, &attr_group);
 }
 
 core_initcall(pm_disk_init);
diff --git a/kernel/power/main.c b/kernel/power/main.c
index f71c9504a5c5..efc08360e627 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -276,8 +276,7 @@ EXPORT_SYMBOL(pm_suspend);
 
 #endif /* CONFIG_SUSPEND */
 
-decl_subsys(power,NULL,NULL);
-
+struct kobject *power_kobj;
 
 /**
  *      state - control system power state.
@@ -290,7 +289,8 @@ decl_subsys(power,NULL,NULL);
  *      proper enumerated value, and initiates a suspend transition.
  */
 
-static ssize_t state_show(struct kset *kset, char *buf)
+static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
+                          char *buf)
 {
         char *s = buf;
 #ifdef CONFIG_SUSPEND
@@ -311,7 +311,8 @@ static ssize_t state_show(struct kset *kset, char *buf)
         return (s - buf);
 }
 
-static ssize_t state_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
+                           const char *buf, size_t n)
 {
 #ifdef CONFIG_SUSPEND
         suspend_state_t state = PM_SUSPEND_STANDBY;
@@ -348,13 +349,15 @@ power_attr(state);
 #ifdef CONFIG_PM_TRACE
 int pm_trace_enabled;
 
-static ssize_t pm_trace_show(struct kset *kset, char *buf)
+static ssize_t pm_trace_show(struct kobject *kobj, struct kobj_attribute *attr,
+                             char *buf)
 {
         return sprintf(buf, "%d\n", pm_trace_enabled);
 }
 
 static ssize_t
-pm_trace_store(struct kset *kset, const char *buf, size_t n)
+pm_trace_store(struct kobject *kobj, struct kobj_attribute *attr,
+               const char *buf, size_t n)
 {
         int val;
 
@@ -386,10 +389,10 @@ static struct attribute_group attr_group = {
 
 static int __init pm_init(void)
 {
-        int error = subsystem_register(&power_subsys);
-        if (!error)
-                error = sysfs_create_group(&power_subsys.kobj,&attr_group);
-        return error;
+        power_kobj = kobject_create_and_add("power", NULL);
+        if (!power_kobj)
+                return -ENOMEM;
+        return sysfs_create_group(power_kobj, &attr_group);
 }
 
 core_initcall(pm_init);
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 195dc4611764..2093c3a9a994 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -54,7 +54,7 @@ extern int pfn_is_nosave(unsigned long);
 extern struct mutex pm_mutex;
 
 #define power_attr(_name) \
-static struct subsys_attribute _name##_attr = { \
+static struct kobj_attribute _name##_attr = {   \
         .attr   = {                             \
                 .name = __stringify(_name),     \
                 .mode = 0644,                   \
@@ -63,8 +63,6 @@ static struct subsys_attribute _name##_attr = {	\
         .store  = _name##_store,                \
 }
 
-extern struct kset power_subsys;
-
 /* Preferred image size in bytes (default 500 MB) */
 extern unsigned long image_size;
 extern int in_suspend;
diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
index e3055ba69159..092e4c620af9 100644
--- a/kernel/rtmutex-tester.c
+++ b/kernel/rtmutex-tester.c
@@ -394,7 +394,7 @@ static SYSDEV_ATTR(status, 0600, sysfs_test_status, NULL);
 static SYSDEV_ATTR(command, 0600, NULL, sysfs_test_command);
 
 static struct sysdev_class rttest_sysclass = {
-        set_kset_name("rttest"),
+        .name = "rttest",
 };
 
 static int init_test_thread(int id)
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index c8a9d13874df..8d6125ad2cf0 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -441,7 +441,7 @@ static SYSDEV_ATTR(available_clocksource, 0600,
                    sysfs_show_available_clocksources, NULL);
 
 static struct sysdev_class clocksource_sysclass = {
-        set_kset_name("clocksource"),
+        .name = "clocksource",
 };
 
 static struct sys_device device_clocksource = {
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index e5e466b27598..ab46ae8c062b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -335,9 +335,9 @@ static int timekeeping_suspend(struct sys_device *dev, pm_message_t state)
 
 /* sysfs resume/suspend bits for timekeeping */
 static struct sysdev_class timekeeping_sysclass = {
+        .name           = "timekeeping",
         .resume         = timekeeping_resume,
         .suspend        = timekeeping_suspend,
-        set_kset_name("timekeeping"),
 };
 
 static struct sys_device device_timer = {
diff --git a/kernel/user.c b/kernel/user.c
index 8320a87f3e5a..ab4fd706993b 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -115,7 +115,7 @@ static void sched_switch_user(struct task_struct *p) { }
 
 #if defined(CONFIG_FAIR_USER_SCHED) && defined(CONFIG_SYSFS)
 
-static struct kobject uids_kobject; /* represents /sys/kernel/uids directory */
+static struct kset *uids_kset; /* represents the /sys/kernel/uids/ directory */
 static DEFINE_MUTEX(uids_mutex);
 
 static inline void uids_mutex_lock(void)
@@ -128,86 +128,83 @@ static inline void uids_mutex_unlock(void)
         mutex_unlock(&uids_mutex);
 }
 
-/* return cpu shares held by the user */
-static ssize_t cpu_shares_show(struct kset *kset, char *buffer)
+/* uid directory attributes */
+static ssize_t cpu_shares_show(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               char *buf)
 {
-        struct user_struct *up = container_of(kset, struct user_struct, kset);
+        struct user_struct *up = container_of(kobj, struct user_struct, kobj);
 
-        return sprintf(buffer, "%lu\n", sched_group_shares(up->tg));
+        return sprintf(buf, "%lu\n", sched_group_shares(up->tg));
 }
 
-/* modify cpu shares held by the user */
-static ssize_t cpu_shares_store(struct kset *kset, const char *buffer,
-                                size_t size)
+static ssize_t cpu_shares_store(struct kobject *kobj,
+                                struct kobj_attribute *attr,
+                                const char *buf, size_t size)
 {
-        struct user_struct *up = container_of(kset, struct user_struct, kset);
+        struct user_struct *up = container_of(kobj, struct user_struct, kobj);
         unsigned long shares;
         int rc;
 
-        sscanf(buffer, "%lu", &shares);
+        sscanf(buf, "%lu", &shares);
 
         rc = sched_group_set_shares(up->tg, shares);
 
         return (rc ? rc : size);
 }
 
-static void user_attr_init(struct subsys_attribute *sa, char *name, int mode)
+static struct kobj_attribute cpu_share_attr =
+        __ATTR(cpu_share, 0644, cpu_shares_show, cpu_shares_store);
+
+/* default attributes per uid directory */
+static struct attribute *uids_attributes[] = {
+        &cpu_share_attr.attr,
+        NULL
+};
+
+/* the lifetime of user_struct is not managed by the core (now) */
+static void uids_release(struct kobject *kobj)
 {
-        sa->attr.name = name;
-        sa->attr.mode = mode;
-        sa->show = cpu_shares_show;
-        sa->store = cpu_shares_store;
+        return;
 }
 
-/* Create "/sys/kernel/uids/<uid>" directory and
- *  "/sys/kernel/uids/<uid>/cpu_share" file for this user.
- */
-static int user_kobject_create(struct user_struct *up)
+static struct kobj_type uids_ktype = {
+        .sysfs_ops = &kobj_sysfs_ops,
+        .default_attrs = uids_attributes,
+        .release = uids_release,
+};
+
+/* create /sys/kernel/uids/<uid>/cpu_share file for this user */
+static int uids_user_create(struct user_struct *up)
 {
-        struct kset *kset = &up->kset;
-        struct kobject *kobj = &kset->kobj;
+        struct kobject *kobj = &up->kobj;
         int error;
 
-        memset(kset, 0, sizeof(struct kset));
-        kobj->parent = &uids_kobject;   /* create under /sys/kernel/uids dir */
-        kobject_set_name(kobj, "%d", up->uid);
-        kset_init(kset);
-        user_attr_init(&up->user_attr, "cpu_share", 0644);
-
-        error = kobject_add(kobj);
-        if (error)
+        memset(kobj, 0, sizeof(struct kobject));
+        kobj->kset = uids_kset;
+        error = kobject_init_and_add(kobj, &uids_ktype, NULL, "%d", up->uid);
+        if (error) {
+                kobject_put(kobj);
                 goto done;
-
-        error = sysfs_create_file(kobj, &up->user_attr.attr);
-        if (error)
-                kobject_del(kobj);
+        }
 
         kobject_uevent(kobj, KOBJ_ADD);
-
 done:
         return error;
 }
 
-/* create these in sysfs filesystem:
+/* create these entries in sysfs:
  *      "/sys/kernel/uids" directory
  *      "/sys/kernel/uids/0" directory (for root user)
  *      "/sys/kernel/uids/0/cpu_share" file (for root user)
  */
-int __init uids_kobject_init(void)
+int __init uids_sysfs_init(void)
 {
-        int error;
+        uids_kset = kset_create_and_add("uids", NULL, kernel_kobj);
+        if (!uids_kset)
+                return -ENOMEM;
 
-        /* create under /sys/kernel dir */
-        uids_kobject.parent = &kernel_subsys.kobj;
-        uids_kobject.kset = &kernel_subsys;
-        kobject_set_name(&uids_kobject, "uids");
-        kobject_init(&uids_kobject);
-
-        error = kobject_add(&uids_kobject);
-        if (!error)
-                error = user_kobject_create(&root_user);
-
-        return error;
+        return uids_user_create(&root_user);
 }
 
 /* work function to remove sysfs directory for a user and free up
@@ -216,7 +213,6 @@ int __init uids_kobject_init(void)
 static void remove_user_sysfs_dir(struct work_struct *w)
 {
         struct user_struct *up = container_of(w, struct user_struct, work);
-        struct kobject *kobj = &up->kset.kobj;
         unsigned long flags;
         int remove_user = 0;
 
@@ -238,9 +234,9 @@ static void remove_user_sysfs_dir(struct work_struct *w)
         if (!remove_user)
                 goto done;
 
-        sysfs_remove_file(kobj, &up->user_attr.attr);
-        kobject_uevent(kobj, KOBJ_REMOVE);
-        kobject_del(kobj);
+        kobject_uevent(&up->kobj, KOBJ_REMOVE);
+        kobject_del(&up->kobj);
+        kobject_put(&up->kobj);
 
         sched_destroy_user(up);
         key_put(up->uid_keyring);
@@ -267,7 +263,8 @@ static inline void free_user(struct user_struct *up, unsigned long flags)
 
 #else   /* CONFIG_FAIR_USER_SCHED && CONFIG_SYSFS */
 
-static inline int user_kobject_create(struct user_struct *up) { return 0; }
+int uids_sysfs_init(void) { return 0; }
+static inline int uids_user_create(struct user_struct *up) { return 0; }
 static inline void uids_mutex_lock(void) { }
 static inline void uids_mutex_unlock(void) { }
 
@@ -324,7 +321,7 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
         struct hlist_head *hashent = uidhashentry(ns, uid);
         struct user_struct *up;
 
-        /* Make uid_hash_find() + user_kobject_create() + uid_hash_insert()
+        /* Make uid_hash_find() + uids_user_create() + uid_hash_insert()
          * atomic.
          */
         uids_mutex_lock();
@@ -370,7 +367,7 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
                         return NULL;
                 }
 
-                if (user_kobject_create(new)) {
+                if (uids_user_create(new)) {
                         sched_destroy_user(new);
                         key_put(new->uid_keyring);
                         key_put(new->session_keyring);