[PATCH v2 3/4] regulator-core: free requested GPIOs and manage the enable list

* [PATCH v2 3/4] regulator-core: free requested GPIOs and manage the enable list
@ 2013-01-15  4:35 Kim, Milo
  2013-01-27  6:10 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Kim, Milo @ 2013-01-15  4:35 UTC (permalink / raw)
  To: Mark Brown; +Cc: Axel Lin, Girdwood, Liam, linux-kernel

 The regulator_ena_gpio_request() allocates the enable GPIO and add the list.
 Related resources should be released if they are not used any more.
 To free requested GPIO and remove it from the enable GPIO list,
 new function, 'regulator_ena_gpio_free()' is added.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
---
 drivers/regulator/core.c |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index dc713c4..8631234 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1501,6 +1501,19 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
 	return 0;
 }
 
+static void regulator_ena_gpio_free(struct regulator_dev *rdev)
+{
+	struct regulator_enable_gpio *pin, *n;
+
+	list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) {
+		if (pin->regulator == rdev && pin->gpio) {
+			gpio_free(pin->gpio);
+			list_del(&pin->list);
+			kfree(pin);
+		}
+	}
+}
+
 /**
  * Balance enable_count of each GPIO and actual GPIO pin control.
  * GPIO is enabled in case of initial use. (enable_count is 0)
@@ -3590,8 +3603,7 @@ unset_supplies:
 scrub:
 	if (rdev->supply)
 		_regulator_put(rdev->supply);
-	if (rdev->ena_gpio)
-		gpio_free(rdev->ena_gpio);
+	regulator_ena_gpio_free(rdev);
 	kfree(rdev->constraints);
 wash:
 	device_unregister(&rdev->dev);
@@ -3626,8 +3638,7 @@ void regulator_unregister(struct regulator_dev *rdev)
 	unset_regulator_supplies(rdev);
 	list_del(&rdev->list);
 	kfree(rdev->constraints);
-	if (rdev->ena_gpio)
-		gpio_free(rdev->ena_gpio);
+	regulator_ena_gpio_free(rdev);
 	device_unregister(&rdev->dev);
 	mutex_unlock(&regulator_list_mutex);
 }
-- 
1.7.9.5


Best Regards,
Milo



^ permalink raw reply related	[flat|nested] 2+ messages in thread