X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=device.c;h=3f83cb4700f99ee4bc608ae5990cc63477ee618c;hb=13cb667dc2c4131663e728bfc4bf3de465d52b20;hp=c02335c1b906c653331d72af5c8220215bcfae97;hpb=4e335f640fadda81aff9dd2dc06703961bea2826;p=project%2Fnetifd.git diff --git a/device.c b/device.c index c02335c..3f83cb4 100644 --- a/device.c +++ b/device.c @@ -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); }