diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-03 04:16:12 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-03 04:16:12 +0100 |
| commit | 93fde774546c947ac8563da431f0a6d47452551d (patch) | |
| tree | ddb62f30713c6617daca608c436fde36a6ebdbed /drivers/sh | |
| parent | sh: Fix up SH-X3 general exception handler build. (diff) | |
| download | linux-93fde774546c947ac8563da431f0a6d47452551d.tar.xz linux-93fde774546c947ac8563da431f0a6d47452551d.zip | |
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')
| -rw-r--r-- | drivers/sh/maple/maple.c | 11 | ||||
| -rw-r--r-- | drivers/sh/superhyway/superhyway.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index 4054fe93d6e4..c71bb4b4ce84 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, }; diff --git a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c index 4d0282b821b5..2d9e7f3d5611 100644 --- a/drivers/sh/superhyway/superhyway.c +++ b/drivers/sh/superhyway/superhyway.c @@ -22,7 +22,7 @@ static int superhyway_devices; static struct device superhyway_bus_device = { - .bus_id = "superhyway", + .init_name = "superhyway", }; static void superhyway_device_release(struct device *dev) @@ -83,7 +83,7 @@ int superhyway_add_device(unsigned long base, struct superhyway_device *sdev, dev->id.id = dev->vcr.mod_id; sprintf(dev->name, "SuperHyway device %04x", dev->id.id); - sprintf(dev->dev.bus_id, "%02x", superhyway_devices); + dev_set_name(&dev->dev, "%02x", superhyway_devices); superhyway_devices++; |