diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 16:38:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 16:38:21 -0700 |
| commit | 2796872c40c462bacf2d09bb99faa6dcd640a620 (patch) | |
| tree | a693c34c9f4312db2458f3d64f501c492a735221 /drivers/zorro | |
| parent | 7ad33e74857f16f1202cbc5746faf52e88e8b376 (diff) | |
| download | lwn-2796872c40c462bacf2d09bb99faa6dcd640a620.tar.gz lwn-2796872c40c462bacf2d09bb99faa6dcd640a620.zip | |
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>
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) /* 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); |