diff options
Diffstat (limited to 'drivers/zorro')
-rw-r--r-- | drivers/zorro/zorro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index a1585d6f6486..d45fb34e2d23 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c | |||
@@ -140,7 +140,7 @@ static int __init zorro_init(void) | |||
140 | 140 | ||
141 | /* Initialize the Zorro bus */ | 141 | /* Initialize the Zorro bus */ |
142 | INIT_LIST_HEAD(&zorro_bus.devices); | 142 | INIT_LIST_HEAD(&zorro_bus.devices); |
143 | strcpy(zorro_bus.dev.bus_id, "zorro"); | 143 | dev_set_name(&zorro_bus.dev, "zorro"); |
144 | error = device_register(&zorro_bus.dev); | 144 | error = device_register(&zorro_bus.dev); |
145 | if (error) { | 145 | if (error) { |
146 | pr_err("Zorro: Error registering zorro_bus\n"); | 146 | pr_err("Zorro: Error registering zorro_bus\n"); |
@@ -167,7 +167,7 @@ static int __init zorro_init(void) | |||
167 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) | 167 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) |
168 | pr_err("Zorro: Address space collision on device %s %pR\n", | 168 | pr_err("Zorro: Address space collision on device %s %pR\n", |
169 | z->name, &z->resource); | 169 | z->name, &z->resource); |
170 | sprintf(z->dev.bus_id, "%02x", i); | 170 | dev_set_name(&z->dev, "%02x", i); |
171 | z->dev.parent = &zorro_bus.dev; | 171 | z->dev.parent = &zorro_bus.dev; |
172 | z->dev.bus = &zorro_bus_type; | 172 | z->dev.bus = &zorro_bus_type; |
173 | error = device_register(&z->dev); | 173 | error = device_register(&z->dev); |