kobjects: fix up improper use of the kobject name field

A number of different drivers incorrect access the kobject name field
directly.  This is not correct as the name might not be in the array.
Use the proper accessor function instead.

5 files changed, 5 insertions, 6 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index feab124d8e05..cbfc81579c9a 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -194,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
 
         if (!device->flags.power_manageable) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",
-                                device->dev.kobj.name));
+                                kobject_name(&device->dev.kobj)));
                 return -ENODEV;
         }
         /*
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2f6a73c01b71..2ce3de5e84af 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -828,7 +828,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         /* prepare interface data */
         policy->kobj.parent = &sys_dev->kobj;
         policy->kobj.ktype = &ktype_cpufreq;
-        strlcpy(policy->kobj.name, "cpufreq", KOBJ_NAME_LEN);
+        kobject_set_name(&policy->kobj, "cpufreq");
 
         ret = kobject_register(&policy->kobj);
         if (ret) {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index e8f102ea9b03..acf1b81b47cb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3076,8 +3076,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         mddev->gendisk = disk;
         mutex_unlock(&disks_mutex);
         mddev->kobj.parent = &disk->kobj;
-        mddev->kobj.k_name = NULL;
-        snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md");
+        kobject_set_name(&mddev->kobj, "%s", "md");
         mddev->kobj.ktype = &md_ktype;
         if (kobject_register(&mddev->kobj))
                 printk(KERN_WARNING "md: cannot register %s/md - name in use\n",
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 4ac161e1ca12..7d7758f3ad8c 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1183,7 +1183,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
                                          pool_count[i], pool_size[i],
                                          pool_active[i]);
                 kobj->parent = &dev->dev.kobj;
-                sprintf(kobj->name, "pool%d", i);
+                kobject_set_name(kobj, "pool%d", i);
                 kobj->ktype = &ktype_veth_pool;
                 kobject_register(kobj);
         }
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 568f1877315c..05ca2ed9eb51 100644
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -48,7 +48,7 @@ pdev_fixup_irq(struct pci_dev *dev,
         dev->irq = irq;
 
         pr_debug("PCI: fixup irq: (%s) got %d\n",
-                dev->dev.kobj.name, dev->irq);
+                kobject_name(&dev->dev.kobj), dev->irq);
 
         /* Always tell the device, so the driver knows what is
            the real IRQ to use; the device does not use it. */