Commit 2796872c40c462bacf2d09bb99faa6dcd640a620
Committed by
Greg Kroah-Hartman
1 parent
7ad33e7485
Exists in
master
and in
4 other branches
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>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
drivers/zorro/zorro.c
... | ... | @@ -140,7 +140,7 @@ |
140 | 140 | |
141 | 141 | /* Initialize the Zorro bus */ |
142 | 142 | INIT_LIST_HEAD(&zorro_bus.devices); |
143 | - strcpy(zorro_bus.dev.bus_id, "zorro"); | |
143 | + dev_set_name(&zorro_bus.dev, "zorro"); | |
144 | 144 | error = device_register(&zorro_bus.dev); |
145 | 145 | if (error) { |
146 | 146 | pr_err("Zorro: Error registering zorro_bus\n"); |
... | ... | @@ -167,7 +167,7 @@ |
167 | 167 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) |
168 | 168 | pr_err("Zorro: Address space collision on device %s %pR\n", |
169 | 169 | z->name, &z->resource); |
170 | - sprintf(z->dev.bus_id, "%02x", i); | |
170 | + dev_set_name(&z->dev, "%02x", i); | |
171 | 171 | z->dev.parent = &zorro_bus.dev; |
172 | 172 | z->dev.bus = &zorro_bus_type; |
173 | 173 | error = device_register(&z->dev); |