mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/2] regulator: Factor out functions to work with regulator_internal
Date: Wed, 15 Jul 2015 07:52:45 +0200	[thread overview]
Message-ID: <1436939566-20823-1-git-send-email-s.hauer@pengutronix.de> (raw)

Internally we only have a struct regulator_internal, so factor
out regulator_enable_internal and regulator_disable_internal
functions which can be called from regulator internal code.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/regulator/core.c | 86 +++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a3c9e41..96bf846 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -43,6 +43,49 @@ struct regulator {
 	struct device_d *dev;
 };
 
+static int regulator_enable_internal(struct regulator_internal *ri)
+{
+	int ret;
+
+	if (ri->enable_count) {
+		ri->enable_count++;
+		return 0;
+	}
+
+	if (!ri->rdev->ops->enable)
+		return -ENOSYS;
+
+	ret = ri->rdev->ops->enable(ri->rdev);
+	if (ret)
+		return ret;
+
+	if (ri->enable_time_us)
+		udelay(ri->enable_time_us);
+
+	ri->enable_count++;
+
+	return 0;
+}
+
+static int regulator_disable_internal(struct regulator_internal *ri)
+{
+	int ret;
+
+	if (!ri->enable_count)
+		return -EINVAL;
+
+	if (!ri->rdev->ops->disable)
+		return -ENOSYS;
+
+	ret = ri->rdev->ops->disable(ri->rdev);
+	if (ret)
+		return ret;
+
+	ri->enable_count--;
+
+	return 0;
+}
+
 static struct regulator_internal * __regulator_register(struct regulator_dev *rd, const char *name)
 {
 	struct regulator_internal *ri;
@@ -239,32 +282,10 @@ struct regulator *regulator_get(struct device_d *dev, const char *supply)
  */
 int regulator_enable(struct regulator *r)
 {
-	struct regulator_internal *ri;
-	int ret;
-
 	if (!r)
 		return 0;
 
-	ri = r->ri;
-
-	if (ri->enable_count) {
-		ri->enable_count++;
-		return 0;
-	}
-
-	if (!ri->rdev->ops->enable)
-		return -ENOSYS;
-
-	ret = ri->rdev->ops->enable(ri->rdev);
-	if (ret)
-		return ret;
-
-	if (ri->enable_time_us)
-		udelay(ri->enable_time_us);
-
-	ri->enable_count++;
-
-	return 0;
+	return regulator_enable_internal(r->ri);
 }
 
 /*
@@ -278,27 +299,10 @@ int regulator_enable(struct regulator *r)
  */
 int regulator_disable(struct regulator *r)
 {
-	struct regulator_internal *ri;
-	int ret;
-
 	if (!r)
 		return 0;
 
-	ri = r->ri;
-
-	if (!ri->enable_count)
-		return -EINVAL;
-
-	if (!ri->rdev->ops->disable)
-		return -ENOSYS;
-
-	ret = ri->rdev->ops->disable(ri->rdev);
-	if (ret)
-		return ret;
-
-	ri->enable_count--;
-
-	return 0;
+	return regulator_disable_internal(r->ri);
 }
 
 static void regulator_print_one(struct regulator_internal *ri)
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2015-07-15  5:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-15  5:52 Sascha Hauer [this message]
2015-07-15  5:52 ` [PATCH 2/2] regulator: Add support for regulator-boot-on device tree property Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436939566-20823-1-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox