From 25be2026816327880d7d8ec7615e42374a70aef6 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 6 Dec 2010 01:21:38 +0100 Subject: lddbus: replace bus_id with dev_name(), dev_set_name() in ldd_bus --- lddbus/lddbus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lddbus/lddbus.c b/lddbus/lddbus.c index be37c6c..7b469ad 100644 --- a/lddbus/lddbus.c +++ b/lddbus/lddbus.c @@ -46,7 +46,7 @@ static int ldd_hotplug(struct device *dev, char **envp, int num_envp, */ static int ldd_match(struct device *dev, struct device_driver *driver) { - return !strncmp(dev->bus_id, driver->name, strlen(driver->name)); + return !strncmp(dev_name(dev), driver->name, strlen(driver->name)); } @@ -59,7 +59,6 @@ static void ldd_bus_release(struct device *dev) } struct device ldd_bus = { - .bus_id = "ldd0", .release = ldd_bus_release }; @@ -102,7 +101,7 @@ int register_ldd_device(struct ldd_device *ldddev) ldddev->dev.bus = &ldd_bus_type; ldddev->dev.parent = &ldd_bus; ldddev->dev.release = ldd_dev_release; - strncpy(ldddev->dev.bus_id, ldddev->name, BUS_ID_SIZE); + dev_set_name(&ldddev->dev, "ldd0", BUS_ID_SIZE); return device_register(&ldddev->dev); } EXPORT_SYMBOL(register_ldd_device); -- cgit v1.2.1-18-gbd029