adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

sh: struct device - replace bus_id with dev_name(), dev_set_name()

Browse source 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:
Kay Sievers 2009-03-24 16:38:21 -07:00 committed by Greg Kroah-Hartman
parent 65a212dd71
commit 1692713ee9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/sh/maple/maple.c
View file

@ -424,7 +424,7 @@ static void maple_attach_driver(struct maple_device *mdev)
/* Do this silently - as not a real device */ /* Do this silently - as not a real device */
function = 0; function = 0;
mdev->driver = &maple_dummy_driver; mdev->driver = &maple_dummy_driver;
sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port); dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
} else { } else {
printk(KERN_INFO printk(KERN_INFO
"Maple bus at (%d, %d): Function 0x%lX\n", "Maple bus at (%d, %d): Function 0x%lX\n",
@ -440,8 +440,8 @@ static void maple_attach_driver(struct maple_device *mdev)
"No maple driver found.\n"); "No maple driver found.\n");
mdev->driver = &maple_dummy_driver; mdev->driver = &maple_dummy_driver;
} }
sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port, dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
mdev->unit, function); mdev->unit, function);
} }
mdev->function = function; mdev->function = function;
mdev->dev.release = &maple_release_device; mdev->dev.release = &maple_release_device;
@ -780,7 +780,7 @@ struct bus_type maple_bus_type = {
EXPORT_SYMBOL_GPL(maple_bus_type); EXPORT_SYMBOL_GPL(maple_bus_type);
static struct device maple_bus = { static struct device maple_bus = {
.bus_id = "maple", .init_name = "maple",
.release = maple_bus_release, .release = maple_bus_release,
}; };

4
drivers/sh/superhyway/superhyway.c
View file

@ -22,7 +22,7 @@
static int superhyway_devices; static int superhyway_devices;
static struct device superhyway_bus_device = { static struct device superhyway_bus_device = {
.bus_id = "superhyway", .init_name = "superhyway",
}; };
static void superhyway_device_release(struct device *dev) 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; dev->id.id = dev->vcr.mod_id;
sprintf(dev->name, "SuperHyway device %04x", dev->id.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++; superhyway_devices++;