Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e3dd0d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent edfaa7c3

block/elevator.c

+2 −6
Original line number Diff line number Diff line
@@ -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) {