openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kay Sievers 2009-03-03 12:16:12 +09:00 committed by Paul Mundt
parent 0d5e19ab07
commit 93fde77454
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/sh/maple/maple.c
View File

@ -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,
};

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

@ -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++;