summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-17 23:05:35 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:38 -0800
commitf9cb074bff8e762ef24c44678a5a7d907f82fbeb (patch)
tree50438fc90b8f6170dd8eb5d43712c61719a16304 /block
parente1543ddf739b22a8c4218716ad50c26b3e147403 (diff)
downloadlinux-3.10-f9cb074bff8e762ef24c44678a5a7d907f82fbeb.tar.gz
linux-3.10-f9cb074bff8e762ef24c44678a5a7d907f82fbeb.tar.bz2
linux-3.10-f9cb074bff8e762ef24c44678a5a7d907f82fbeb.zip
Kobject: rename kobject_init_ng() to kobject_init()
Now that the old kobject_init() function is gone, rename kobject_init_ng() to kobject_init() 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.c2
-rw-r--r--block/ll_rw_blk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 645469a4f49..f9736fbdab0 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -185,7 +185,7 @@ static elevator_t *elevator_alloc(struct request_queue *q,
eq->ops = &e->ops;
eq->elevator_type = e;
- kobject_init_ng(&eq->kobj, &elv_ktype);
+ kobject_init(&eq->kobj, &elv_ktype);
mutex_init(&eq->sysfs_lock);
eq->hash = kmalloc_node(sizeof(struct hlist_head) * ELV_HASH_ENTRIES,
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 234dd3de182..5ccec8aa964 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1862,7 +1862,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
init_timer(&q->unplug_timer);
- kobject_init_ng(&q->kobj, &queue_ktype);
+ kobject_init(&q->kobj, &queue_ktype);
mutex_init(&q->sysfs_lock);