[PATCH] netdev - udevdb+dev.d changes

[elogind.git] / udev-remove.c

diff --git a/udev-remove.c b/udev-remove.c
index 98c45d6c333650ff4ebb381ad6508e49568cad7b..c838f15ce3521a6510a128320db658b6afef47a2 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -137,36 +137,24 @@ int udev_remove_device(char *path, char *subsystem)
 
        memset(&dev, 0x00, sizeof(dev));
 
 
        memset(&dev, 0x00, sizeof(dev));
 

-       dev.type = get_device_type(path, subsystem);
-
-       switch (dev.type) {
-       case 'b':
-       case 'c':
-               retval = udevdb_get_dev(path, &dev);
-               if (retval) {
-                       dbg("'%s' not found in database, falling back on default name", path);
-                       temp = strrchr(path, '/');
-                       if (temp == NULL)
-                               return -ENODEV;
-                       strfieldcpy(dev.name, &temp[1]);
-               }
-
-               dbg("name='%s'", dev.name);
-               udevdb_delete_dev(path);
+       retval = udevdb_get_dev(path, &dev);
+       if (retval != 0) {
+               dbg("'%s' not found in database, falling back on default name", path);
+               temp = strrchr(path, '/');
+               if (temp == NULL)
+                       return -ENODEV;
+               strfieldcpy(dev.name, &temp[1]);
+       }
+       dbg("name='%s'", dev.name);

 
 

-               dev_d_send(&dev, subsystem);
+       dev.type = get_device_type(path, subsystem);
+       dev_d_send(&dev, subsystem);
+       udevdb_delete_dev(path);

 
 

+       if (dev.type == 'b' || dev.type == 'c')

                retval = delete_node(&dev);
                retval = delete_node(&dev);

-               break;
-
-       case 'n':
+       else if (dev.type == 'n')

                retval = 0;
                retval = 0;

-               break;
-
-       default:
-               dbg("unknown device type '%c'", dev.type);
-               retval = -EINVAL;
-       }

 
        return retval;
 }
 
        return retval;
 }