浏览代码

regulator: core: Move more deallocation into class unregister

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>
Mark Brown 10 年之前
父节点
当前提交
29f5f4860a
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/regulator/core.c

+ 3 - 2
drivers/regulator/core.c

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