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.
  ...

3 files changed, 90 insertions, 72 deletions

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 5245717295b8..4b010ff814c9 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -490,7 +490,7 @@ static struct super_operations hypfs_s_ops = {
         .show_options   = hypfs_show_options,
 };
 
-static decl_subsys(s390, NULL, NULL);
+static struct kobject *s390_kobj;
 
 static int __init hypfs_init(void)
 {
@@ -506,17 +506,18 @@ static int __init hypfs_init(void)
                         goto fail_diag;
                 }
         }
-        kobj_set_kset_s(&s390_subsys, hypervisor_subsys);
-        rc = subsystem_register(&s390_subsys);
-        if (rc)
+        s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
+        if (!s390_kobj) {
+                rc = -ENOMEM;;
                 goto fail_sysfs;
+        }
         rc = register_filesystem(&hypfs_type);
         if (rc)
                 goto fail_filesystem;
         return 0;
 
 fail_filesystem:
-        subsystem_unregister(&s390_subsys);
+        kobject_put(s390_kobj);
 fail_sysfs:
         if (!MACHINE_IS_VM)
                 hypfs_diag_exit();
@@ -530,7 +531,7 @@ static void __exit hypfs_exit(void)
         if (!MACHINE_IS_VM)
                 hypfs_diag_exit();
         unregister_filesystem(&hypfs_type);
-        subsystem_unregister(&s390_subsys);
+        kobject_put(s390_kobj);
 }
 
 module_init(hypfs_init)
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index ce0856d32500..b97694fa62ec 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -162,22 +162,25 @@ EXPORT_SYMBOL_GPL(diag308);
 /* SYSFS */
 
 #define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value)             \
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _format, _value);                          \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name, S_IRUGO, sys_##_prefix##_##_name##_show, NULL);
 
 #define DEFINE_IPL_ATTR_RW(_prefix, _name, _fmt_out, _fmt_in, _value)   \
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _fmt_out,                                  \
                         (unsigned long long) _value);                   \
 }                                                                       \
-static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,       \
+static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,    \
+                struct kobj_attribute *attr,                            \
                 const char *buf, size_t len)                            \
 {                                                                       \
         unsigned long long value;                                       \
@@ -186,25 +189,27 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,	\
         _value = value;                                                 \
         return len;                                                     \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name,(S_IRUGO | S_IWUSR),                               \
                         sys_##_prefix##_##_name##_show,                 \
                         sys_##_prefix##_##_name##_store);
 
 #define DEFINE_IPL_ATTR_STR_RW(_prefix, _name, _fmt_out, _fmt_in, _value)\
-static ssize_t sys_##_prefix##_##_name##_show(struct kset *kset,        \
+static ssize_t sys_##_prefix##_##_name##_show(struct kobject *kobj,     \
+                struct kobj_attribute *attr,                            \
                 char *page)                                             \
 {                                                                       \
         return sprintf(page, _fmt_out, _value);                         \
 }                                                                       \
-static ssize_t sys_##_prefix##_##_name##_store(struct kset *kset,       \
+static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,    \
+                struct kobj_attribute *attr,                            \
                 const char *buf, size_t len)                            \
 {                                                                       \
         if (sscanf(buf, _fmt_in, _value) != 1)                          \
                 return -EINVAL;                                         \
         return len;                                                     \
 }                                                                       \
-static struct subsys_attribute sys_##_prefix##_##_name##_attr =         \
+static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
         __ATTR(_name,(S_IRUGO | S_IWUSR),                               \
                         sys_##_prefix##_##_name##_show,                 \
                         sys_##_prefix##_##_name##_store);
@@ -270,14 +275,16 @@ void __init setup_ipl_info(void)
 struct ipl_info ipl_info;
 EXPORT_SYMBOL_GPL(ipl_info);
 
-static ssize_t ipl_type_show(struct kset *kset, char *page)
+static ssize_t ipl_type_show(struct kobject *kobj, struct kobj_attribute *attr,
+                             char *page)
 {
         return sprintf(page, "%s\n", ipl_type_str(ipl_info.type));
 }
 
-static struct subsys_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
+static struct kobj_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
 
-static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
+static ssize_t sys_ipl_device_show(struct kobject *kobj,
+                                   struct kobj_attribute *attr, char *page)
 {
         struct ipl_parameter_block *ipl = IPL_PARMBLOCK_START;
 
@@ -292,7 +299,7 @@ static ssize_t sys_ipl_device_show(struct kset *kset, char *page)
         }
 }
 
-static struct subsys_attribute sys_ipl_device_attr =
+static struct kobj_attribute sys_ipl_device_attr =
         __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
 
 static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,
@@ -367,7 +374,8 @@ static struct attribute_group ipl_fcp_attr_group = {
 
 /* CCW ipl device attributes */
 
-static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page)
+static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
+                                     struct kobj_attribute *attr, char *page)
 {
         char loadparm[LOADPARM_LEN + 1] = {};
 
@@ -379,7 +387,7 @@ static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page)
         return sprintf(page, "%s\n", loadparm);
 }
 
-static struct subsys_attribute sys_ipl_ccw_loadparm_attr =
+static struct kobj_attribute sys_ipl_ccw_loadparm_attr =
         __ATTR(loadparm, 0444, ipl_ccw_loadparm_show, NULL);
 
 static struct attribute *ipl_ccw_attrs[] = {
@@ -418,7 +426,7 @@ static struct attribute_group ipl_unknown_attr_group = {
         .attrs = ipl_unknown_attrs,
 };
 
-static decl_subsys(ipl, NULL, NULL);
+static struct kset *ipl_kset;
 
 /*
  * reipl section
@@ -465,7 +473,8 @@ static void reipl_get_ascii_loadparm(char *loadparm)
         strstrip(loadparm);
 }
 
-static ssize_t reipl_ccw_loadparm_show(struct kset *kset, char *page)
+static ssize_t reipl_ccw_loadparm_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *page)
 {
         char buf[LOADPARM_LEN + 1];
 
@@ -473,7 +482,8 @@ static ssize_t reipl_ccw_loadparm_show(struct kset *kset, char *page)
         return sprintf(page, "%s\n", buf);
 }
 
-static ssize_t reipl_ccw_loadparm_store(struct kset *kset,
+static ssize_t reipl_ccw_loadparm_store(struct kobject *kobj,
+                                        struct kobj_attribute *attr,
                                         const char *buf, size_t len)
 {
         int i, lp_len;
@@ -500,7 +510,7 @@ static ssize_t reipl_ccw_loadparm_store(struct kset *kset,
         return len;
 }
 
-static struct subsys_attribute sys_reipl_ccw_loadparm_attr =
+static struct kobj_attribute sys_reipl_ccw_loadparm_attr =
         __ATTR(loadparm, 0644, reipl_ccw_loadparm_show,
                reipl_ccw_loadparm_store);
 
@@ -568,13 +578,15 @@ static int reipl_set_type(enum ipl_type type)
         return 0;
 }
 
-static ssize_t reipl_type_show(struct kset *kset, char *page)
+static ssize_t reipl_type_show(struct kobject *kobj,
+                               struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", ipl_type_str(reipl_type));
 }
 
-static ssize_t reipl_type_store(struct kset *kset, const char *buf,
-                                size_t len)
+static ssize_t reipl_type_store(struct kobject *kobj,
+                                struct kobj_attribute *attr,
+                                const char *buf, size_t len)
 {
         int rc = -EINVAL;
 
@@ -587,10 +599,10 @@ static ssize_t reipl_type_store(struct kset *kset, const char *buf,
         return (rc != 0) ? rc : len;
 }
 
-static struct subsys_attribute reipl_type_attr =
+static struct kobj_attribute reipl_type_attr =
                 __ATTR(reipl_type, 0644, reipl_type_show, reipl_type_store);
 
-static decl_subsys(reipl, NULL, NULL);
+static struct kset *reipl_kset;
 
 /*
  * dump section
@@ -663,13 +675,15 @@ static int dump_set_type(enum dump_type type)
         return 0;
 }
 
-static ssize_t dump_type_show(struct kset *kset, char *page)
+static ssize_t dump_type_show(struct kobject *kobj,
+                              struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", dump_type_str(dump_type));
 }
 
-static ssize_t dump_type_store(struct kset *kset, const char *buf,
-                               size_t len)
+static ssize_t dump_type_store(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               const char *buf, size_t len)
 {
         int rc = -EINVAL;
 
@@ -682,26 +696,28 @@ static ssize_t dump_type_store(struct kset *kset, const char *buf,
         return (rc != 0) ? rc : len;
 }
 
-static struct subsys_attribute dump_type_attr =
+static struct kobj_attribute dump_type_attr =
                 __ATTR(dump_type, 0644, dump_type_show, dump_type_store);
 
-static decl_subsys(dump, NULL, NULL);
+static struct kset *dump_kset;
 
 /*
  * Shutdown actions section
  */
 
-static decl_subsys(shutdown_actions, NULL, NULL);
+static struct kset *shutdown_actions_kset;
 
 /* on panic */
 
-static ssize_t on_panic_show(struct kset *kset, char *page)
+static ssize_t on_panic_show(struct kobject *kobj,
+                             struct kobj_attribute *attr, char *page)
 {
         return sprintf(page, "%s\n", shutdown_action_str(on_panic_action));
 }
 
-static ssize_t on_panic_store(struct kset *kset, const char *buf,
-                              size_t len)
+static ssize_t on_panic_store(struct kobject *kobj,
+                              struct kobj_attribute *attr,
+                              const char *buf, size_t len)
 {
         if (strncmp(buf, SHUTDOWN_REIPL_STR, strlen(SHUTDOWN_REIPL_STR)) == 0)
                 on_panic_action = SHUTDOWN_REIPL;
@@ -717,7 +733,7 @@ static ssize_t on_panic_store(struct kset *kset, const char *buf,
         return len;
 }
 
-static struct subsys_attribute on_panic_attr =
+static struct kobj_attribute on_panic_attr =
                 __ATTR(on_panic, 0644, on_panic_show, on_panic_store);
 
 void do_reipl(void)
@@ -814,23 +830,23 @@ static int __init ipl_register_fcp_files(void)
 {
         int rc;
 
-        rc = sysfs_create_group(&ipl_subsys.kobj,
+        rc = sysfs_create_group(&ipl_kset->kobj,
                                 &ipl_fcp_attr_group);
         if (rc)
                 goto out;
-        rc = sysfs_create_bin_file(&ipl_subsys.kobj,
+        rc = sysfs_create_bin_file(&ipl_kset->kobj,
                                    &ipl_parameter_attr);
         if (rc)
                 goto out_ipl_parm;
-        rc = sysfs_create_bin_file(&ipl_subsys.kobj,
+        rc = sysfs_create_bin_file(&ipl_kset->kobj,
                                    &ipl_scp_data_attr);
         if (!rc)
                 goto out;
 
-        sysfs_remove_bin_file(&ipl_subsys.kobj, &ipl_parameter_attr);
+        sysfs_remove_bin_file(&ipl_kset->kobj, &ipl_parameter_attr);
 
 out_ipl_parm:
-        sysfs_remove_group(&ipl_subsys.kobj, &ipl_fcp_attr_group);
+        sysfs_remove_group(&ipl_kset->kobj, &ipl_fcp_attr_group);
 out:
         return rc;
 }
@@ -839,12 +855,12 @@ static int __init ipl_init(void)
 {
         int rc;
 
-        rc = firmware_register(&ipl_subsys);
-        if (rc)
-                return rc;
+        ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj);
+        if (!ipl_kset)
+                return -ENOMEM;
         switch (ipl_info.type) {
         case IPL_TYPE_CCW:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_ccw_attr_group);
                 break;
         case IPL_TYPE_FCP:
@@ -852,16 +868,16 @@ static int __init ipl_init(void)
                 rc = ipl_register_fcp_files();
                 break;
         case IPL_TYPE_NSS:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_nss_attr_group);
                 break;
         default:
-                rc = sysfs_create_group(&ipl_subsys.kobj,
+                rc = sysfs_create_group(&ipl_kset->kobj,
                                         &ipl_unknown_attr_group);
                 break;
         }
         if (rc)
-                firmware_unregister(&ipl_subsys);
+                kset_unregister(ipl_kset);
         return rc;
 }
 
@@ -883,7 +899,7 @@ static int __init reipl_nss_init(void)
 
         if (!MACHINE_IS_VM)
                 return 0;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_nss_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_nss_attr_group);
         if (rc)
                 return rc;
         strncpy(reipl_nss_name, kernel_nss_name, NSS_NAME_SIZE + 1);
@@ -898,7 +914,7 @@ static int __init reipl_ccw_init(void)
         reipl_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
         if (!reipl_block_ccw)
                 return -ENOMEM;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_ccw_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_ccw_attr_group);
         if (rc) {
                 free_page((unsigned long)reipl_block_ccw);
                 return rc;
@@ -936,7 +952,7 @@ static int __init reipl_fcp_init(void)
         reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
         if (!reipl_block_fcp)
                 return -ENOMEM;
-        rc = sysfs_create_group(&reipl_subsys.kobj, &reipl_fcp_attr_group);
+        rc = sysfs_create_group(&reipl_kset->kobj, &reipl_fcp_attr_group);
         if (rc) {
                 free_page((unsigned long)reipl_block_fcp);
                 return rc;
@@ -958,12 +974,12 @@ static int __init reipl_init(void)
 {
         int rc;
 
-        rc = firmware_register(&reipl_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&reipl_subsys, &reipl_type_attr);
+        reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj);
+        if (!reipl_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr);
         if (rc) {
-                firmware_unregister(&reipl_subsys);
+                kset_unregister(reipl_kset);
                 return rc;
         }
         rc = reipl_ccw_init();
@@ -988,7 +1004,7 @@ static int __init dump_ccw_init(void)
         dump_block_ccw = (void *) get_zeroed_page(GFP_KERNEL);
         if (!dump_block_ccw)
                 return -ENOMEM;
-        rc = sysfs_create_group(&dump_subsys.kobj, &dump_ccw_attr_group);
+        rc = sysfs_create_group(&dump_kset->kobj, &dump_ccw_attr_group);
         if (rc) {
                 free_page((unsigned long)dump_block_ccw);
                 return rc;
@@ -1012,7 +1028,7 @@ static int __init dump_fcp_init(void)
         dump_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
         if (!dump_block_fcp)
                 return -ENOMEM;
-        rc = sysfs_create_group(&dump_subsys.kobj, &dump_fcp_attr_group);
+        rc = sysfs_create_group(&dump_kset->kobj, &dump_fcp_attr_group);
         if (rc) {
                 free_page((unsigned long)dump_block_fcp);
                 return rc;
@@ -1047,12 +1063,12 @@ static int __init dump_init(void)
 {
         int rc;
 
-        rc = firmware_register(&dump_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&dump_subsys, &dump_type_attr);
+        dump_kset = kset_create_and_add("dump", NULL, firmware_kobj);
+        if (!dump_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr);
         if (rc) {
-                firmware_unregister(&dump_subsys);
+                kset_unregister(dump_kset);
                 return rc;
         }
         rc = dump_ccw_init();
@@ -1069,12 +1085,13 @@ static int __init shutdown_actions_init(void)
 {
         int rc;
 
-        rc = firmware_register(&shutdown_actions_subsys);
-        if (rc)
-                return rc;
-        rc = subsys_create_file(&shutdown_actions_subsys, &on_panic_attr);
+        shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL,
+                                                    firmware_kobj);
+        if (!shutdown_actions_kset)
+                return -ENOMEM;
+        rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr);
         if (rc) {
-                firmware_unregister(&shutdown_actions_subsys);
+                kset_unregister(shutdown_actions_kset);
                 return rc;
         }
         atomic_notifier_chain_register(&panic_notifier_list,
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 22b800ce2126..3bbac1293be4 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -1145,7 +1145,7 @@ static void etr_work_fn(struct work_struct *work)
  * Sysfs interface functions
  */
 static struct sysdev_class etr_sysclass = {
-        set_kset_name("etr")
+        .name   = "etr",
 };
 
 static struct sys_device etr_port0_dev = {