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

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

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

block/elevator.c

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

block/ll_rw_blk.c

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

	ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj),

			  "%s", "queue");

	if (ret < 0)

		return ret;

drivers/base/class.c

+2 −2
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int class_device_add(struct class_device *class_dev) 
	else

		class_dev->kobj.parent = &parent_class->subsys.kobj;



	error = kobject_add_ng(&class_dev->kobj, class_dev->kobj.parent,

	error = kobject_add(&class_dev->kobj, class_dev->kobj.parent,

			    "%s", class_dev->class_id);

	if (error)

		goto out2;

drivers/base/core.c

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static struct kobject *get_device_parent(struct device *dev, 
		if (!k)

			return NULL;

		k->kset = &dev->class->class_dirs;

		retval = kobject_add_ng(k, parent_kobj, "%s", dev->class->name);

		retval = kobject_add(k, parent_kobj, "%s", dev->class->name);

		if (retval < 0) {

			kobject_put(k);

			return NULL;
@@ -776,7 +776,7 @@ static void device_remove_class_symlinks(struct device *dev) 
 *	This is part 2 of device_register(), though may be called

 *	separately _iff_ device_initialize() has been called separately.

 *

 *	This adds it to the kobject hierarchy via kobject_add_ng(), adds it

 *	This adds it to the kobject hierarchy via kobject_add(), adds it

 *	to the global and sibling lists for the device, then

 *	adds it to the other relevant subsystems of the driver model.

 */
@@ -807,7 +807,7 @@ int device_add(struct device *dev) 
		goto Error;



	/* first, register with generic layer. */

	error = kobject_add_ng(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id);

	error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id);

	if (error)

		goto Error;

drivers/base/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj, 
	if (!name)

		return -ENOMEM;



	return kobject_add_ng(kobj, &drv->p->kobj, "%s", name);

	return kobject_add(kobj, &drv->p->kobj, "%s", name);

}

EXPORT_SYMBOL_GPL(driver_add_kobj);