summaryrefslogtreecommitdiff
path: root/drivers/sh/maple
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-03-25 02:38:21 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-25 02:38:21 +0300
commit1692713ee94e8d26f592a8e90b817ef66354246c (patch)
treeca34495354b1ad506e727681032caaa72ea1e590 /drivers/sh/maple
parent65a212dd71ffd99c83ad780205932fcb96a973b6 (diff)
downloadlinux-1692713ee94e8d26f592a8e90b817ef66354246c.tar.xz
sh: 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/sh/maple')
-rw-r--r--drivers/sh/maple/maple.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index 63f0de29aa14..7e1257af3d41 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -424,7 +424,7 @@ static void maple_attach_driver(struct maple_device *mdev)
/* Do this silently - as not a real device */
function = 0;
mdev->driver = &maple_dummy_driver;
- sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+ dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
} else {
printk(KERN_INFO
"Maple bus at (%d, %d): Function 0x%lX\n",
@@ -440,8 +440,8 @@ static void maple_attach_driver(struct maple_device *mdev)
"No maple driver found.\n");
mdev->driver = &maple_dummy_driver;
}
- sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
- mdev->unit, function);
+ dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
+ mdev->unit, function);
}
mdev->function = function;
mdev->dev.release = &maple_release_device;
@@ -780,7 +780,7 @@ struct bus_type maple_bus_type = {
EXPORT_SYMBOL_GPL(maple_bus_type);
static struct device maple_bus = {
- .bus_id = "maple",
+ .init_name = "maple",
.release = maple_bus_release,
};