summaryrefslogtreecommitdiffstats
path: root/drivers/base/isa.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-30 01:36:48 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 10:44:31 -0800
commit1e0b2cf933ebf32494eba3f668859ba57f06a951 (patch)
treeb8d9a3b41a452fb922cd3425e67ea8278c128c70 /drivers/base/isa.c
parent210272a28465a7a31bcd580d2f9529f924965aa5 (diff)
downloadlinux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.tar.gz
linux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.tar.bz2
linux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.zip
driver core: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/isa.c')
-rw-r--r--drivers/base/isa.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index efd577574948..479694b6cbe3 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -11,7 +11,7 @@
#include <linux/isa.h>
static struct device isa_bus = {
- .bus_id = "isa"
+ .init_name = "isa"
};
struct isa_dev {
@@ -135,9 +135,8 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
isa_dev->dev.parent = &isa_bus;
isa_dev->dev.bus = &isa_bus_type;
- snprintf(isa_dev->dev.bus_id, BUS_ID_SIZE, "%s.%u",
- isa_driver->driver.name, id);
-
+ dev_set_name(&isa_dev->dev, "%s.%u",
+ isa_driver->driver.name, id);
isa_dev->dev.platform_data = isa_driver;
isa_dev->dev.release = isa_dev_release;
isa_dev->id = id;