[PATCH] move kernel name/number evaluation into udev_init_device()

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index baafdea51ae9020e67161c702709e33b432cb734..22a363ed34d49dfdb3443572e51b72e65ae7e239 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -85,7 +85,7 @@ static int delete_node(struct udevice *udev)
        if (stat(filename, &stats) != 0)
                return -1;
 
-       if (udev->major && stats.st_rdev != makedev(udev->major, udev->minor)) {
+       if (udev->devt && stats.st_rdev != udev->devt) {
                info("device node '%s' points to a different device, skip removal", filename);
                return -1;
        }
@@ -147,10 +147,10 @@ int udev_remove_device(struct udevice *udev)
        const char *temp;
        int retval;
 
-       if (udev->type != 'b' && udev->type != 'c')
+       if (udev->type != BLOCK && udev->type != CLASS)
                return 0;
 
-       retval = udev_db_get_device(udev);
+       retval = udev_db_get_device_by_devpath(udev, udev->devpath);
        if (retval) {
                /* fall back to kernel name */
                temp = strrchr(udev->devpath, '/');