diff options
Diffstat (limited to 'libudev')
| -rw-r--r-- | libudev/libudev-device.c | 13 | ||||
| -rw-r--r-- | libudev/libudev-enumerate.c | 12 |
2 files changed, 1 insertions, 24 deletions
diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c index add1c99ec0..dffeed0b79 100644 --- a/libudev/libudev-device.c +++ b/libudev/libudev-device.c @@ -508,20 +508,9 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic char path[UTIL_PATH_SIZE]; const char *subdir; - /* follow "device" link in deprecated sys layout */ - if (strncmp(udev_device->devpath, "/class/", 7) == 0 || - strncmp(udev_device->devpath, "/block/", 7) == 0) { - util_strscpyl(path, sizeof(path), udev_device->syspath, "/device", NULL); - if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0) { - udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path); - if (udev_device_parent != NULL) - return udev_device_parent; - } - } - util_strscpy(path, sizeof(path), udev_device->syspath); subdir = &path[strlen(udev_get_sys_path(udev_device->udev))+1]; - while (1) { + for (;;) { char *pos; pos = strrchr(subdir, '/'); diff --git a/libudev/libudev-enumerate.c b/libudev/libudev-enumerate.c index 186abb927e..2fcd348296 100644 --- a/libudev/libudev-enumerate.c +++ b/libudev/libudev-enumerate.c @@ -685,18 +685,6 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate) scan_dir(udev_enumerate, "bus", "devices", NULL); dbg(udev, "searching '/class/*' dir\n"); scan_dir(udev_enumerate, "class", NULL, NULL); - /* if block isn't a class, scan /block/ */ - util_strscpyl(base, sizeof(base), udev_get_sys_path(udev), "/class/block", NULL); - if (stat(base, &statbuf) != 0) { - if (match_subsystem(udev_enumerate, "block")) { - dbg(udev, "searching '/block/*' dir\n"); - /* scan disks */ - scan_dir_and_add_devices(udev_enumerate, "block", NULL, NULL); - /* scan partitions */ - dbg(udev, "searching '/block/*/*' dir\n"); - scan_dir(udev_enumerate, "block", NULL, "block"); - } - } } return 0; } |