diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:21 -0400 |
commit | 1692713ee94e8d26f592a8e90b817ef66354246c (patch) | |
tree | ca34495354b1ad506e727681032caaa72ea1e590 /drivers/sh/superhyway/superhyway.c | |
parent | 65a212dd71ffd99c83ad780205932fcb96a973b6 (diff) |
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/superhyway/superhyway.c')
-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 @@ | |||
22 | static int superhyway_devices; | 22 | static int superhyway_devices; |
23 | 23 | ||
24 | static struct device superhyway_bus_device = { | 24 | static struct device superhyway_bus_device = { |
25 | .bus_id = "superhyway", | 25 | .init_name = "superhyway", |
26 | }; | 26 | }; |
27 | 27 | ||
28 | static void superhyway_device_release(struct device *dev) | 28 | static void superhyway_device_release(struct device *dev) |
@@ -83,7 +83,7 @@ int superhyway_add_device(unsigned long base, struct superhyway_device *sdev, | |||
83 | dev->id.id = dev->vcr.mod_id; | 83 | dev->id.id = dev->vcr.mod_id; |
84 | 84 | ||
85 | sprintf(dev->name, "SuperHyway device %04x", dev->id.id); | 85 | sprintf(dev->name, "SuperHyway device %04x", dev->id.id); |
86 | sprintf(dev->dev.bus_id, "%02x", superhyway_devices); | 86 | dev_set_name(&dev->dev, "%02x", superhyway_devices); |
87 | 87 | ||
88 | superhyway_devices++; | 88 | superhyway_devices++; |
89 | 89 | ||