7 files changed, 12 insertions, 13 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index d973c986f721..c3c3a3339049 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
                 goto out;
         }
 
-        strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));
         /*
          * If the parent device has a DMA mask associated with it,
          * propagate it down to the children.
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
                 dev->dev.dma_mask = &dev->dma_mask;
         }
 
+        dev_set_name(&dev->dev, "%s", info->name);
         dev->devid       = info->devid;
         dev->dev.parent  = lchip->dev;
         dev->dev.bus     = &locomo_bus_type;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 2048ae0b1559..c8e8f0ea59e1 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -550,9 +550,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
                 goto out;
         }
 
-        snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
-                 "%4.4lx", info->offset);
-
+        dev_set_name(&dev->dev, "%4.4lx", info->offset);
         dev->devid       = info->devid;
         dev->dev.parent  = sachip->dev;
         dev->dev.bus     = &sa1111_bus_type;
@@ -560,7 +558,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
         dev->dev.coherent_dma_mask = sachip->dev->coherent_dma_mask;
         dev->res.start   = sachip->phys + info->offset;
         dev->res.end     = dev->res.start + 511;
-        dev->res.name    = dev->dev.bus_id;
+        dev->res.name    = dev_name(&dev->dev);
         dev->res.flags   = IORESOURCE_MEM;
         dev->mapbase     = sachip->base + info->offset;
         dev->skpcr_mask  = info->skpcr_mask;
@@ -570,6 +568,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
         if (ret) {
                 printk("SA1111: failed to allocate resource for %s\n",
                         dev->res.name);
+                dev_set_name(&dev->dev, NULL);
                 kfree(dev);
                 goto out;
         }
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index bc299b07a6fa..ae39553589dd 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -247,7 +247,7 @@ static int __devinit scoop_probe(struct platform_device *pdev)
         devptr->gpio.base = -1;
 
         if (inf->gpio_base != 0) {
-                devptr->gpio.label = pdev->dev.bus_id;
+                devptr->gpio.label = dev_name(&pdev->dev);
                 devptr->gpio.base = inf->gpio_base;
                 devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */
                 devptr->gpio.set = scoop_gpio_set;
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 2de425f62c2c..f5cfdabcb87d 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -783,7 +783,7 @@ static void ecard_proc_init(void)
 
 #define ec_set_resource(ec,nr,st,sz)                            \
         do {                                                    \
-                (ec)->resource[nr].name = ec->dev.bus_id;       \
+                (ec)->resource[nr].name = dev_name(&ec->dev);   \
                 (ec)->resource[nr].start = st;                  \
                 (ec)->resource[nr].end = (st) + (sz) - 1;       \
                 (ec)->resource[nr].flags = IORESOURCE_MEM;      \
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 619d05e6cf76..5a1588cf8242 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -393,9 +393,7 @@ static int impd1_probe(struct lm_device *dev)
                 if (!d)
                         continue;
 
-                snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),
-                         "lm%x:%5.5lx", dev->id, idev->offset >> 12);
-
+                dev_set_name(&d->dev, "lm%x:%5.5lx", dev->id, idev->offset >> 12);
                 d->dev.parent   = &dev->dev;
                 d->res.start    = dev->resource.start + idev->offset;
                 d->res.end      = d->res.start + SZ_4K - 1;
diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c
index 622cdc4212dd..f939c5091405 100644
--- a/arch/arm/mach-integrator/lm.c
+++ b/arch/arm/mach-integrator/lm.c
@@ -81,8 +81,10 @@ int lm_device_register(struct lm_device *dev)
         dev->dev.release = lm_device_release;
         dev->dev.bus = &lm_bustype;
 
-        snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), "lm%d", dev->id);
-        dev->resource.name = dev->dev.bus_id;
+        ret = dev_set_name(&dev->dev, "lm%d", dev->id);
+        if (ret)
+                return ret;
+        dev->resource.name = dev_name(&dev->dev);
 
         ret = request_resource(&iomem_resource, &dev->resource);
         if (ret == 0) {
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 848fdcafaa28..ff1413eae0b8 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -334,7 +334,7 @@ static int omap_mbox_init(struct omap_mbox *mbox)
         }
 
         mbox->dev.class = &omap_mbox_class;
-        strlcpy(mbox->dev.bus_id, mbox->name, BUS_ID_SIZE);
+        dev_set_name(&mbox->dev, "%s", mbox->name);
         dev_set_drvdata(&mbox->dev, mbox);
 
         ret = device_register(&mbox->dev);