sysfs: In sysfs_chmod_file lazily propagate the mode change.

[safe/jmp/linux-2.6] / drivers / parisc / pdc_stable.c

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index e1b9cba..13a64bc 100644 (file)
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -370,7 +370,7 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf)
        if (!i) /* entry is not ready */
                return -ENODATA;
        
-       for (i = 0; devpath->layers[i] && (likely(i < 6)); i++)
+       for (i = 0; i < 6 && devpath->layers[i]; i++)
                out += sprintf(out, "%u ", devpath->layers[i]);
 
        out += sprintf(out, "\n");
@@ -829,7 +829,7 @@ static ssize_t pdcs_autoboot_write(struct kobject *kobj,
                                   struct kobj_attribute *attr,
                                   const char *buf, size_t count)
 {
-       return pdcs_auto_write(kset, attr, buf, count, PF_AUTOBOOT);
+       return pdcs_auto_write(kobj, attr, buf, count, PF_AUTOBOOT);
 }
 
 /**
@@ -845,7 +845,7 @@ static ssize_t pdcs_autosearch_write(struct kobject *kobj,
                                     struct kobj_attribute *attr,
                                     const char *buf, size_t count)
 {
-       return pdcs_auto_write(kset, attr, buf, count, PF_AUTOSEARCH);
+       return pdcs_auto_write(kobj, attr, buf, count, PF_AUTOSEARCH);
 }
 
 /**
@@ -960,8 +960,8 @@ static struct attribute_group pdcs_attr_group = {
        .attrs = pdcs_subsys_attrs,
 };
 
-static decl_subsys(paths, NULL);
-static decl_subsys(stable, NULL);
+static struct kobject *stable_kobj;
+static struct kset *paths_kset;
 
 /**
  * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage.
@@ -991,13 +991,12 @@ pdcs_register_pathentries(void)
                if (err < 0)
                        continue;
 
-               if ((err = kobject_set_name(&entry->kobj, "%s", entry->name)))
+               entry->kobj.kset = paths_kset;
+               err = kobject_init_and_add(&entry->kobj, &ktype_pdcspath, NULL,
+                                          "%s", entry->name);
+               if (err)
                        return err;
-               entry->kobj.kset = &paths_subsys;
-               entry->kobj.ktype = &ktype_pdcspath;
-               if ((err = kobject_register(&entry->kobj)))
-                       return err;
-               
+
                /* kobject is now registered */
                write_lock(&entry->rw_lock);
                entry->ready = 2;
@@ -1009,6 +1008,7 @@ pdcs_register_pathentries(void)
                }
 
                write_unlock(&entry->rw_lock);
+               kobject_uevent(&entry->kobj, KOBJ_ADD);
        }
        
        return 0;
@@ -1026,7 +1026,7 @@ pdcs_unregister_pathentries(void)
        for (i = 0; (entry = pdcspath_entries[i]); i++) {
                read_lock(&entry->rw_lock);
                if (entry->ready >= 2)
-                       kobject_unregister(&entry->kobj);
+                       kobject_put(&entry->kobj);
                read_unlock(&entry->rw_lock);
        }
 }
@@ -1058,19 +1058,24 @@ pdc_stable_init(void)
        /* the actual result is 16 bits away */
        pdcs_osid = (u16)(result >> 16);
 
-       /* For now we'll register the stable subsys within this driver */
-       if ((rc = firmware_register(&stable_subsys)))
+       /* For now we'll register the directory at /sys/firmware/stable */
+       stable_kobj = kobject_create_and_add("stable", firmware_kobj);
+       if (!stable_kobj) {
+               rc = -ENOMEM;
                goto fail_firmreg;
+       }
 
        /* Don't forget the root entries */
-       error = sysfs_create_group(&stable_subsys.kobj, pdcs_attr_group);
+       error = sysfs_create_group(stable_kobj, &pdcs_attr_group);
 
-       /* register the paths subsys as a subsystem of stable subsys */
-       paths_subsys.kobj.kset = &stable_subsys;
-       if ((rc = subsystem_register(&paths_subsys)))
-               goto fail_subsysreg;
+       /* register the paths kset as a child of the stable kset */
+       paths_kset = kset_create_and_add("paths", NULL, stable_kobj);
+       if (!paths_kset) {
+               rc = -ENOMEM;
+               goto fail_ksetreg;
+       }
 
-       /* now we create all "files" for the paths subsys */
+       /* now we create all "files" for the paths kset */
        if ((rc = pdcs_register_pathentries()))
                goto fail_pdcsreg;
 
@@ -1078,10 +1083,10 @@ pdc_stable_init(void)
        
 fail_pdcsreg:
        pdcs_unregister_pathentries();
-       subsystem_unregister(&paths_subsys);
+       kset_unregister(paths_kset);
        
-fail_subsysreg:
-       firmware_unregister(&stable_subsys);
+fail_ksetreg:
+       kobject_put(stable_kobj);
        
 fail_firmreg:
        printk(KERN_INFO PDCS_PREFIX " bailing out\n");
@@ -1092,9 +1097,8 @@ static void __exit
 pdc_stable_exit(void)
 {
        pdcs_unregister_pathentries();
-       subsystem_unregister(&paths_subsys);
-
-       firmware_unregister(&stable_subsys);
+       kset_unregister(paths_kset);
+       kobject_put(stable_kobj);
 }