From 75aed480a5a1e9d80234b7a99537dbfbfdcbccc2 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 26 Jun 2015 08:35:09 +0200 Subject: driver: detect: detect parent devices aswell Let device_detect_by_name detect parent devices aswell. We separate the devname strings by colons and call device_detect() for each component. This makes it possible for example to detect nand0.root.ubi.root With the above detect will be called for nand0, nand0.root, nand0.root.ubi and nand0.root.ubi.root. The nand0.root detection step will detect the UBI volume and attach it. Signed-off-by: Sascha Hauer --- drivers/base/driver.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 24cb5bc62b..338bea1280 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -113,14 +113,29 @@ int device_detect(struct device_d *dev) return dev->detect(dev); } -int device_detect_by_name(const char *devname) +int device_detect_by_name(const char *__devname) { - struct device_d *dev = get_device_by_name(devname); + char *devname = xstrdup(__devname); + char *str = devname; + struct device_d *dev; + int ret = -ENODEV; + + while (1) { + strsep(&str, "."); + + dev = get_device_by_name(devname); + if (dev) + ret = device_detect(dev); - if (!dev) - return -ENODEV; + if (!str) + break; + else + *(str - 1) = '.'; + } - return device_detect(dev); + free(devname); + + return ret; } static int match(struct driver_d *drv, struct device_d *dev) -- cgit v1.2.3