Kobject: change drivers/parisc/pdc_stable.c to use kobject_init_and_add

Stop using kobject_register, as this way we can control the sending of
the uevent properly, after everything is properly initialized.

Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 880b10b8a311..87bc6b73b249 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -991,13 +991,12 @@ pdcs_register_pathentries(void)
                 if (err < 0)
                         continue;
 
-                if ((err = kobject_set_name(&entry->kobj, "%s", entry->name)))
-                        return err;
                 entry->kobj.kset = paths_kset;
-                entry->kobj.ktype = &ktype_pdcspath;
-                if ((err = kobject_register(&entry->kobj)))
+                err = kobject_init_and_add(&entry->kobj, &ktype_pdcspath, NULL,
+                                           "%s", entry->name);
+                if (err)
                         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;