vsprintf: reuse almost identical simple_strtoulX() functions

[safe/jmp/linux-2.6] / drivers / zorro / zorro.c

diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 2dda20a..d45fb34 100644 (file)
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -140,7 +140,7 @@ static int __init zorro_init(void)
 
     /* Initialize the Zorro bus */
     INIT_LIST_HEAD(&zorro_bus.devices);
-    strcpy(zorro_bus.dev.bus_id, "zorro");
+    dev_set_name(&zorro_bus.dev, "zorro");
     error = device_register(&zorro_bus.dev);
     if (error) {
        pr_err("Zorro: Error registering zorro_bus\n");
@@ -165,11 +165,9 @@ static int __init zorro_init(void)
        zorro_name_device(z);
        z->resource.name = z->name;
        if (request_resource(zorro_find_parent_resource(z), &z->resource))
-           printk(KERN_ERR "Zorro: Address space collision on device %s "
-                  "[%lx:%lx]\n",
-                  z->name, (unsigned long)zorro_resource_start(z),
-                  (unsigned long)zorro_resource_end(z));
-       sprintf(z->dev.bus_id, "%02x", i);
+           pr_err("Zorro: Address space collision on device %s %pR\n",
+                  z->name, &z->resource);
+       dev_set_name(&z->dev, "%02x", i);
        z->dev.parent = &zorro_bus.dev;
        z->dev.bus = &zorro_bus_type;
        error = device_register(&z->dev);