diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-18 09:05:35 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-25 07:40:38 +0300 |
commit | b2d6db5878a0832659ed58476357eea2db915550 (patch) | |
tree | c7c9e98431078ca7b0405e8003bd905ab62df7c4 /block | |
parent | 9e7bbccd0290e720e0874443932869c55f63d5a8 (diff) | |
download | linux-b2d6db5878a0832659ed58476357eea2db915550.tar.xz |
Kobject: rename kobject_add_ng() to kobject_add()
Now that the old kobject_add() function is gone, rename kobject_add_ng()
to kobject_add() to clean up the namespace.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block')
-rw-r--r-- | block/elevator.c | 2 | ||||
-rw-r--r-- | block/ll_rw_blk.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index 5445c3c2ee8a..645469a4f49f 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -929,7 +929,7 @@ int elv_register_queue(struct request_queue *q) elevator_t *e = q->elevator; int error; - error = kobject_add_ng(&e->kobj, &q->kobj, "%s", "iosched"); + error = kobject_add(&e->kobj, &q->kobj, "%s", "iosched"); if (!error) { struct elv_fs_entry *attr = e->elevator_type->elevator_attrs; if (attr) { diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 8054b7d8e07c..234dd3de1824 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -4180,8 +4180,8 @@ int blk_register_queue(struct gendisk *disk) if (!q || !q->request_fn) return -ENXIO; - ret = kobject_add_ng(&q->kobj, kobject_get(&disk->dev.kobj), - "%s", "queue"); + ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj), + "%s", "queue"); if (ret < 0) return ret; |