aboutsummaryrefslogtreecommitdiff
path: root/drivers
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
commitb2d6db5878a0832659ed58476357eea2db915550 (patch)
treec7c9e98431078ca7b0405e8003bd905ab62df7c4 /drivers
parent9e7bbccd0290e720e0874443932869c55f63d5a8 (diff)
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 'drivers')
-rw-r--r--drivers/base/class.c4
-rw-r--r--drivers/base/core.c6
-rw-r--r--drivers/base/driver.c2
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/net/iseries_veth.c2
-rw-r--r--drivers/uio/uio.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 624b3316e93..8e3cba22438 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -586,8 +586,8 @@ 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,
- "%s", class_dev->class_id);
+ error = kobject_add(&class_dev->kobj, class_dev->kobj.parent,
+ "%s", class_dev->class_id);
if (error)
goto out2;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 06e8738ab26..e88170293ca 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -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;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 5aacff208f2..94b697a9b4e 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -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);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7ae9740c483..989d8549f98 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1389,7 +1389,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
rdev->mddev = mddev;
printk(KERN_INFO "md: bind<%s>\n", b);
- if ((err = kobject_add_ng(&rdev->kobj, &mddev->kobj, "dev-%s", b)))
+ if ((err = kobject_add(&rdev->kobj, &mddev->kobj, "dev-%s", b)))
goto fail;
if (rdev->bdev->bd_part)
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 1a8299acd3f..ee15667d613 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1084,7 +1084,7 @@ static struct net_device * __init veth_probe_one(int vlan,
}
kobject_init_ng(&port->kobject, &veth_port_ktype);
- if (0 != kobject_add_ng(&port->kobject, &dev->dev.kobj, "veth_port"))
+ if (0 != kobject_add(&port->kobject, &dev->dev.kobj, "veth_port"))
veth_error("Failed adding port for %s to sysfs.\n", dev->name);
veth_info("%s attached to iSeries vlan %d (LPAR map = 0x%.4X)\n",
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index acc387de988..1ec2d31f263 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -172,7 +172,7 @@ static int uio_dev_add_attributes(struct uio_device *idev)
kobject_init_ng(&map->kobj, &map_attr_type);
map->mem = mem;
mem->map = map;
- ret = kobject_add_ng(&map->kobj, idev->map_dir, "map%d", mi);
+ ret = kobject_add(&map->kobj, idev->map_dir, "map%d", mi);
if (ret)
goto err;
ret = kobject_uevent(&map->kobj, KOBJ_ADD);