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>

5 files changed, 6 insertions, 6 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 8e3cba224384..61fd26cc9f0e 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -553,7 +553,7 @@ static struct class_device_attribute class_uevent_attr =
 void class_device_initialize(struct class_device *class_dev)
 {
         class_dev->kobj.kset = &class_obj_subsys;
-        kobject_init_ng(&class_dev->kobj, &class_device_ktype);
+        kobject_init(&class_dev->kobj, &class_device_ktype);
         INIT_LIST_HEAD(&class_dev->node);
 }
 
diff --git a/drivers/base/core.c b/drivers/base/core.c
index e88170293ca0..675a719dcdd2 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -525,7 +525,7 @@ static void klist_children_put(struct klist_node *n)
 void device_initialize(struct device *dev)
 {
         dev->kobj.kset = devices_kset;
-        kobject_init_ng(&dev->kobj, &device_ktype);
+        kobject_init(&dev->kobj, &device_ktype);
         klist_init(&dev->klist_children, klist_children_get,
                    klist_children_put);
         INIT_LIST_HEAD(&dev->dma_pools);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 989d8549f988..ae800ba061a6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2033,7 +2033,7 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
         if (err)
                 goto abort_free;
 
-        kobject_init_ng(&rdev->kobj, &rdev_ktype);
+        kobject_init(&rdev->kobj, &rdev_ktype);
 
         rdev->desc_nr = -1;
         rdev->saved_raid_disk = -1;
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index ee15667d6135..419861cbc65e 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -844,7 +844,7 @@ static int veth_init_connection(u8 rlp)
 
         /* This gets us 1 reference, which is held on behalf of the driver
          * infrastructure. It's released at module unload. */
-        kobject_init_ng(&cnx->kobject, &veth_lpar_connection_ktype);
+        kobject_init(&cnx->kobject, &veth_lpar_connection_ktype);
 
         msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
         if (! msgs) {
@@ -1083,7 +1083,7 @@ static struct net_device * __init veth_probe_one(int vlan,
                 return NULL;
         }
 
-        kobject_init_ng(&port->kobject, &veth_port_ktype);
+        kobject_init(&port->kobject, &veth_port_ktype);
         if (0 != kobject_add(&port->kobject, &dev->dev.kobj, "veth_port"))
                 veth_error("Failed adding port for %s to sysfs.\n", dev->name);
 
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 1ec2d31f2639..f352731add64 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -169,7 +169,7 @@ static int uio_dev_add_attributes(struct uio_device *idev)
                 map = kzalloc(sizeof(*map), GFP_KERNEL);
                 if (!map)
                         goto err;
-                kobject_init_ng(&map->kobj, &map_attr_type);
+                kobject_init(&map->kobj, &map_attr_type);
                 map->mem = mem;
                 mem->map = map;
                 ret = kobject_add(&map->kobj, idev->map_dir, "map%d", mi);