1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index eb06d0b2cb74..0a8e1ff2af8a 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;
         }
@@ -593,7 +592,8 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
                 if (dev->dma_mask != 0xffffffffUL) {
                         ret = dmabounce_register_dev(&dev->dev, 1024, 4096);
                         if (ret) {
-                                printk("SA1111: Failed to register %s with dmabounce", dev->dev.bus_id);
+                                dev_err(&dev->dev, "SA1111: Failed to register"
+                                        " with dmabounce\n");
                                 device_unregister(&dev->dev);
                         }
                 }
@@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
         if (!sachip)
                 return -ENOMEM;
 
-        sachip->clk = clk_get(me, "GPIO27_CLK");
+        sachip->clk = clk_get(me, "SA1111_CLK");
         if (!sachip->clk) {
                 ret = PTR_ERR(sachip->clk);
                 goto err_free;