regulator: core: Move more deallocation into class unregister
authorMark Brown <broonie@kernel.org>
Fri, 7 Aug 2015 19:01:32 +0000 (20:01 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 12 Aug 2015 10:01:30 +0000 (11:01 +0100)
We really ought to be using the class dvice lifetime management features
more than we are rather than open coding them so take a step towards that
by moving some of the simplest deallocations to the dev_release() function.

Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/core.c

index 89be8e28727522740c0fd8c2fced9a154a0b8f73..01a0a78368b80ab1e670d380fcea1938630600df 100644 (file)
@@ -3598,6 +3598,9 @@ static const struct attribute_group *regulator_dev_groups[] = {
 static void regulator_dev_release(struct device *dev)
 {
        struct regulator_dev *rdev = dev_get_drvdata(dev);
+
+       kfree(rdev->constraints);
+       of_node_put(rdev->dev.of_node);
        kfree(rdev);
 }
 
@@ -3829,9 +3832,7 @@ void regulator_unregister(struct regulator_dev *rdev)
        unset_regulator_supplies(rdev);
        list_del(&rdev->list);
        mutex_unlock(&regulator_list_mutex);
-       kfree(rdev->constraints);
        regulator_ena_gpio_free(rdev);
-       of_node_put(rdev->dev.of_node);
        device_unregister(&rdev->dev);
 }
 EXPORT_SYMBOL_GPL(regulator_unregister);