From f026eb8247d74f88a6b704af866879867574f9f0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 5 Sep 2011 04:12:10 +0200 Subject: [PATCH] remove code duplication --- device.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/device.c b/device.c index e206a76..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,22 +278,8 @@ 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; -} - -static void -__device_free_unused(struct device *dev) -{ - if (!list_empty(&dev->users)) - return; - - device_free(dev); + __device_free_unused(dev); } void -- 2.11.0