X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=7307414d737b4b9a2467d9dc966657847b60cfba;hp=c02335c1b906c653331d72af5c8220215bcfae97;hb=aa446207119b958eb51c6b9d447cd03a011927bd;hpb=4e335f640fadda81aff9dd2dc06703961bea2826

diff --git a/device.c b/device.c
index c02335c..7307414 100644
--- a/device.c
+++ b/device.c
@@ -179,7 +179,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 	if (name)
 		strncpy(dev->ifname, name, IFNAMSIZ);
 
-	fprintf(stderr, "Initialize device '%s'\n", dev->ifname);
+	DPRINTF("Initialize device '%s'\n", dev->ifname);
 	INIT_LIST_HEAD(&dev->users);
 	dev->type = type;
 }
@@ -228,7 +228,7 @@ void device_cleanup(struct device *dev)
 {
 	struct device_user *dep, *tmp;
 
-	fprintf(stderr, "Clean up device '%s'\n", dev->ifname);
+	DPRINTF("Clean up device '%s'\n", dev->ifname);
 	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
 		if (!dep->cb)
 			continue;
@@ -261,6 +261,15 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+static void
+__device_free_unused(struct device *dev)
+{
+	if (!list_empty(&dev->users))
+		return;
+
+	device_free(dev);
+}
+
 void device_remove_user(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
@@ -269,24 +278,18 @@ void device_remove_user(struct device_user *dep)
 		device_release(dep);
 
 	list_del(&dep->list);
-
-	if (list_empty(&dev->users)) {
-		/* all references have gone away, remove this device */
-		device_free(dev);
-	}
-
 	dep->dev = NULL;
+	__device_free_unused(dev);
 }
 
 void
-device_free_all(void)
+device_free_unused(struct device *dev)
 {
-	struct device *dev, *tmp;
+	struct device *tmp;
 
-	avl_for_each_element_safe(&devices, dev, avl, tmp) {
-		if (!list_empty(&dev->users))
-			continue;
+	if (dev)
+		return __device_free_unused(dev);
 
-		device_free(dev);
-	}
+	avl_for_each_element_safe(&devices, dev, avl, tmp)
+		__device_free_unused(dev);
 }