X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-remove.c;h=c61a948fa0b179ba987063d922995f703b5cc3c5;hb=5840bc63e2029d22682d8de77dc8fcc4da1b436c;hp=9862a6f201baf757cfb91b345dcde8dfef2383f8;hpb=ca9998602336f67eb2590819eecf416977885e2a;p=elogind.git

diff --git a/udev-remove.c b/udev-remove.c
index 9862a6f20..c61a948fa 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -36,27 +36,30 @@
 
 
 /*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device.  But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
+ * Look up the sysfs path in the database to see if we have named this device
+ * something different from the kernel name.  If we have, us it.  If not, use
+ * the default kernel name for lack of anything else to know to do.
  */
-static char *get_name(char *dev, int major, int minor)
+static char *get_name(char *path, int major, int minor)
 {
 	static char name[100];
+	struct udevice *dev;
 	char *temp;
 
-	temp = udevdb_get_udevice_by_sysfs(dev);
-	dbg("udevdb_get_udevice_by_sysfs returned %s", temp);
-	if (temp != NULL)
-		return temp;
-	
-	temp = strrchr(dev, '/');
+	dev = udevdb_get_dev(path);
+	if (dev != NULL) {
+		strcpy(name, dev->name);
+		goto exit;
+	}
+
+	dbg("%s not found in database, falling back on default name", path);
+	temp = strrchr(path, '/');
 	if (temp == NULL)
 		return NULL;
 	strncpy(name, &temp[1], sizeof(name));
 
+exit:
 	dbg("name is %s", name);
-
 	return &name[0];
 }
 
@@ -86,7 +89,7 @@ int udev_remove_device(char *device, char *subsystem)
 		goto exit;
 	}
 
-	udevdb_delete_udevice(name);
+	udevdb_delete_dev(device);
 
 	return delete_node(name);