aboutsummaryrefslogtreecommitdiff
path: root/drivers/sh/maple
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-03-03 12:16:12 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-03-03 12:16:12 +0900
commit93fde774546c947ac8563da431f0a6d47452551d (patch)
treeddb62f30713c6617daca608c436fde36a6ebdbed /drivers/sh/maple
parent0d5e19ab07cf61cb0794cfac4df0a1bd5d1e19d7 (diff)
downloadlinux-93fde774546c947ac8563da431f0a6d47452551d.tar.gz
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> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/maple')
-rw-r--r--drivers/sh/maple/maple.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index 4054fe93d6e..c71bb4b4ce8 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -368,10 +368,8 @@ static void maple_attach_driver(struct maple_device *mdev)
/* Do this silently - as not a real device */
function = 0;
mdev->driver = &maple_unsupported_device;
- sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
-
+ dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
} else {
-
matched =
bus_for_each_drv(&maple_bus_type, NULL, mdev,
maple_check_matching_driver);
@@ -381,8 +379,9 @@ static void maple_attach_driver(struct maple_device *mdev)
dev_info(&mdev->dev, "no driver found\n");
mdev->driver = &maple_unsupported_device;
}
- 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;
@@ -789,7 +788,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,
};