summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2010-12-06 01:21:38 +0100
committerJavier Martinez Canillas <martinez.javier@gmail.com>2010-12-06 01:21:38 +0100
commit25be2026816327880d7d8ec7615e42374a70aef6 (patch)
tree0cb1b1642894241aa1272899c2226e077b49c3f1
parent671c39ffae1a32fe97875583d7e849dc42f7427c (diff)
downloadldd3-25be2026816327880d7d8ec7615e42374a70aef6.tar.gz
lddbus: replace bus_id with dev_name(), dev_set_name() in ldd_bus
-rw-r--r--lddbus/lddbus.c5
1 files 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);