lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 120/196] Kobject: change drivers/block/pktcdvd.c to use kobject_init_and_add
    Date
    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>
    ---
    drivers/block/pktcdvd.c | 9 +++++----
    1 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
    index 17da699..d1ee383 100644
    --- 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;
    }
    /*
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 09:31    [W:0.024 / U:60.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site