Skip to content

Commit

Permalink
zorro: struct device - replace bus_id with dev_name(), dev_set_name()
Browse files Browse the repository at this point in the history
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  • Loading branch information
Kay Sievers authored and Greg Kroah-Hartman committed Mar 24, 2009
1 parent 7ad33e7 commit 2796872
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/zorro/zorro.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
Expand Down

0 comments on commit 2796872

Please sign in to comment.