diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-03 12:16:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-03 12:16:12 +0900 |
| commit | 93fde774546c947ac8563da431f0a6d47452551d (patch) | |
| tree | ddb62f30713c6617daca608c436fde36a6ebdbed /drivers/sh/superhyway | |
| parent | 0d5e19ab07cf61cb0794cfac4df0a1bd5d1e19d7 (diff) | |
| download | linux-93fde774546c947ac8563da431f0a6d47452551d.tar.gz linux-93fde774546c947ac8563da431f0a6d47452551d.tar.bz2 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/superhyway')
| -rw-r--r-- | drivers/sh/superhyway/superhyway.c | 4 |
1 files changed, 2 insertions, 2 deletions
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++; |