summaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/lm.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-05-30 17:42:11 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 21:55:03 -0700
commit3f9787046ea37a26170dc4439efa21f8d23a9978 (patch)
tree7daa536e4231f683f9ed95ea1e007dd9d09f846c /arch/arm/mach-integrator/lm.c
parent2222c313e9371b6476787594bc5804c72cee2597 (diff)
arm: bus_id -> dev_name() and dev_set_name() conversions
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-integrator/lm.c')
-rw-r--r--arch/arm/mach-integrator/lm.c6
1 files changed, 4 insertions, 2 deletions
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) {