mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
zorro: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:
parent
7ad33e7485
commit
2796872c40
1 changed files with 2 additions and 2 deletions
|
@ -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");
|
||||
|
@ -167,7 +167,7 @@ static int __init zorro_init(void)
|
|||
if (request_resource(zorro_find_parent_resource(z), &z->resource))
|
||||
pr_err("Zorro: Address space collision on device %s %pR\n",
|
||||
z->name, &z->resource);
|
||||
sprintf(z->dev.bus_id, "%02x", i);
|
||||
dev_set_name(&z->dev, "%02x", i);
|
||||
z->dev.parent = &zorro_bus.dev;
|
||||
z->dev.bus = &zorro_bus_type;
|
||||
error = device_register(&z->dev);
|
||||
|
|
Loading…
Reference in a new issue