Kobject: change drivers/block/pktcdvd.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: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 17da6999bef01baa00b621c67999f5aa48c48bcf..d1ee38361e0bdb0638d603642a862dd3a37b2759 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -110,17 +110,18 @@ static struct pktcdvd_kobj* pkt_kobj_create(struct pktcdvd_device *pd,
                                        struct kobj_type* ktype)
 {
        struct pktcdvd_kobj *p;
+       int error;
+
        p = kzalloc(sizeof(*p), GFP_KERNEL);
        if (!p)
                return NULL;
-       kobject_set_name(&p->kobj, "%s", name);
-       p->kobj.parent = parent;
-       p->kobj.ktype = ktype;
        p->pd = pd;
-       if (kobject_register(&p->kobj) != 0) {
+       error = kobject_init_and_add(&p->kobj, ktype, parent, "%s", name);
+       if (error) {
                kobject_put(&p->kobj);
                return NULL;
        }
+       kobject_uevent(&p->kobj, KOBJ_ADD);
        return p;
 }
 /*