diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-17 23:05:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:36 -0800 |
| commit | 29e3dd0df1b9556170ce90484a9d1a2ff9104ea7 (patch) | |
| tree | 63552639fe2c05e96fdc5a02f234b10ec78866f5 | |
| parent | edfaa7c36574f1bf09c65ad602412db9da5f96bf (diff) | |
| download | op-kernel-dev-29e3dd0df1b9556170ce90484a9d1a2ff9104ea7.zip op-kernel-dev-29e3dd0df1b9556170ce90484a9d1a2ff9104ea7.tar.gz | |
Kobject: convert block/elevator.c to use kobject_init/add_ng()
This converts the code to use the new kobject functions, cleaning up the
logic in doing so.
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | block/elevator.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/block/elevator.c b/block/elevator.c index e452deb..5445c3c 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -185,9 +185,7 @@ static elevator_t *elevator_alloc(struct request_queue *q, eq->ops = &e->ops; eq->elevator_type = e; - kobject_init(&eq->kobj); - kobject_set_name(&eq->kobj, "%s", "iosched"); - eq->kobj.ktype = &elv_ktype; + kobject_init_ng(&eq->kobj, &elv_ktype); mutex_init(&eq->sysfs_lock); eq->hash = kmalloc_node(sizeof(struct hlist_head) * ELV_HASH_ENTRIES, @@ -931,9 +929,7 @@ int elv_register_queue(struct request_queue *q) elevator_t *e = q->elevator; int error; - e->kobj.parent = &q->kobj; - - error = kobject_add(&e->kobj); + error = kobject_add_ng(&e->kobj, &q->kobj, "%s", "iosched"); if (!error) { struct elv_fs_entry *attr = e->elevator_type->elevator_attrs; if (attr) { |
