create udevdb files only if somehting interesting happened

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index c3a7880b496cb2a9d25554a5e5a59b92daef83c5..b9a4384ee06e649b5f41cfaf94be96270e12c617 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -34,7 +34,6 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
 #include "udev_db.h"
 #include "logging.h"
 
@@ -141,9 +140,7 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-       const char *temp;
-
-       if (udev->type != BLOCK && udev->type != CLASS)
+       if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
                return 0;
 
        if (udev_db_get_device(udev, udev->devpath) == 0) {
@@ -154,14 +151,9 @@ int udev_remove_device(struct udevice *udev)
                dbg("remove name='%s'", udev->name);
                udev_db_delete_device(udev);
        } else {
-               /* fall back to kernel name */
-               temp = strrchr(udev->devpath, '/');
-               if (temp == NULL)
-                       return -ENODEV;
-               strlcpy(udev->name, &temp[1], sizeof(udev->name));
-               dbg("'%s' not found in database, falling back on default name", udev->name);
+               dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+               strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
        }
-
        /* use full path to the environment */
        snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
        udev->devname[sizeof(udev->devname)-1] = '\0';