aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-03-02 22:16:12 -0500
committerPaul Mundt <lethal@linux-sh.org>2009-03-02 22:16:12 -0500
commit93fde774546c947ac8563da431f0a6d47452551d (patch)
treeddb62f30713c6617daca608c436fde36a6ebdbed
parent0d5e19ab07cf61cb0794cfac4df0a1bd5d1e19d7 (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> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/sh/maple/maple.c11
-rw-r--r--drivers/sh/superhyway/superhyway.c4
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)
368 /* Do this silently - as not a real device */ 368 /* Do this silently - as not a real device */
369 function = 0; 369 function = 0;
370 mdev->driver = &maple_unsupported_device; 370 mdev->driver = &maple_unsupported_device;
371 sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port); 371 dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
372
373 } else { 372 } else {
374
375 matched = 373 matched =
376 bus_for_each_drv(&maple_bus_type, NULL, mdev, 374 bus_for_each_drv(&maple_bus_type, NULL, mdev,
377 maple_check_matching_driver); 375 maple_check_matching_driver);
@@ -381,8 +379,9 @@ static void maple_attach_driver(struct maple_device *mdev)
381 dev_info(&mdev->dev, "no driver found\n"); 379 dev_info(&mdev->dev, "no driver found\n");
382 mdev->driver = &maple_unsupported_device; 380 mdev->driver = &maple_unsupported_device;
383 } 381 }
384 sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port, 382
385 mdev->unit, function); 383 dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
384 mdev->unit, function);
386 } 385 }
387 386
388 mdev->function = function; 387 mdev->function = function;
@@ -789,7 +788,7 @@ struct bus_type maple_bus_type = {
789EXPORT_SYMBOL_GPL(maple_bus_type); 788EXPORT_SYMBOL_GPL(maple_bus_type);
790 789
791static struct device maple_bus = { 790static struct device maple_bus = {
792 .bus_id = "maple", 791 .init_name = "maple",
793 .release = maple_bus_release, 792 .release = maple_bus_release,
794}; 793};
795 794
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 @@
22static int superhyway_devices; 22static int superhyway_devices;
23 23
24static struct device superhyway_bus_device = { 24static struct device superhyway_bus_device = {
25 .bus_id = "superhyway", 25 .init_name = "superhyway",
26}; 26};
27 27
28static void superhyway_device_release(struct device *dev) 28static 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