From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: <agross@codeaurora.org>, <linux-arm-msm@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<patches@opensource.wolfsonmicro.com>
Subject: [PATCH 3/9] regulator: ab8500: move to set_optimum_mode
Date: Tue, 27 Jan 2015 18:46:33 -0800 [thread overview]
Message-ID: <1422413199-17273-4-git-send-email-bjorn.andersson@sonymobile.com> (raw)
In-Reply-To: <1422413199-17273-1-git-send-email-bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
---
drivers/regulator/ab8500.c | 48 +++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 0f97514..c1588c1 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -320,27 +320,6 @@ static int ab8500_regulator_is_enabled(struct regulator_dev *rdev)
return 0;
}
-static unsigned int ab8500_regulator_get_optimum_mode(
- struct regulator_dev *rdev, int input_uV,
- int output_uV, int load_uA)
-{
- unsigned int mode;
-
- struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
-
- if (info == NULL) {
- dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
- return -EINVAL;
- }
-
- if (load_uA <= info->load_lp_uA)
- mode = REGULATOR_MODE_IDLE;
- else
- mode = REGULATOR_MODE_NORMAL;
-
- return mode;
-}
-
static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
unsigned int mode)
{
@@ -430,6 +409,27 @@ out_unlock:
return ret;
}
+static int ab8500_regulator_set_optimum_mode(
+ struct regulator_dev *rdev, int input_uV,
+ int output_uV, int load_uA)
+{
+ unsigned int mode;
+
+ struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
+
+ if (info == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ return -EINVAL;
+ }
+
+ if (load_uA <= info->load_lp_uA)
+ mode = REGULATOR_MODE_IDLE;
+ else
+ mode = REGULATOR_MODE_NORMAL;
+
+ return ab8500_regulator_set_mode(rdev, mode);
+}
+
static unsigned int ab8500_regulator_get_mode(struct regulator_dev *rdev)
{
struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
@@ -645,7 +645,7 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
.is_enabled = ab8500_regulator_is_enabled,
- .get_optimum_mode = ab8500_regulator_get_optimum_mode,
+ .set_optimum_mode = ab8500_regulator_set_optimum_mode,
.set_mode = ab8500_regulator_set_mode,
.get_mode = ab8500_regulator_get_mode,
.get_voltage_sel = ab8500_regulator_get_voltage_sel,
@@ -656,7 +656,7 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = {
static struct regulator_ops ab8540_aux3_regulator_volt_mode_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
- .get_optimum_mode = ab8500_regulator_get_optimum_mode,
+ .set_optimum_mode = ab8500_regulator_set_optimum_mode,
.set_mode = ab8500_regulator_set_mode,
.get_mode = ab8500_regulator_get_mode,
.is_enabled = ab8500_regulator_is_enabled,
@@ -678,7 +678,7 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
.is_enabled = ab8500_regulator_is_enabled,
- .get_optimum_mode = ab8500_regulator_get_optimum_mode,
+ .set_optimum_mode = ab8500_regulator_set_optimum_mode,
.set_mode = ab8500_regulator_set_mode,
.get_mode = ab8500_regulator_get_mode,
.list_voltage = regulator_list_voltage_table,
--
1.9.1
next prev parent reply other threads:[~2015-01-28 2:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 2:46 [PATCH 0/9] Simplify regulator_set_optimum_mode Bjorn Andersson
2015-01-28 2:46 ` [PATCH 1/9] regulator: core: Consolidate drms update handling Bjorn Andersson
2015-01-28 19:52 ` Mark Brown
2015-01-28 2:46 ` [PATCH 2/9] regulator: core: Introduce set_optimum_mode op Bjorn Andersson
2015-01-28 19:52 ` Mark Brown
2015-01-30 0:07 ` Bjorn Andersson
2015-01-30 12:27 ` Mark Brown
2015-02-09 22:08 ` Bjorn Andersson
2015-02-10 7:08 ` Mark Brown
2015-02-05 22:16 ` Bjorn Andersson
2015-02-06 11:46 ` Mark Brown
2015-01-28 2:46 ` Bjorn Andersson [this message]
2015-01-28 19:56 ` [PATCH 3/9] regulator: ab8500: move to set_optimum_mode Mark Brown
2015-01-28 2:46 ` [PATCH 4/9] regulator: wm831x-ldo: " Bjorn Andersson
2015-01-28 2:46 ` [PATCH 5/9] regulator: wm8350: " Bjorn Andersson
2015-01-28 2:46 ` [PATCH 6/9] regulator: hi6421: " Bjorn Andersson
2015-01-28 2:46 ` [PATCH 7/9] regulator: wm8400: " Bjorn Andersson
2015-01-28 2:46 ` [PATCH 8/9] regulator: Drop now unused get_optimum_mode Bjorn Andersson
2015-01-28 2:46 ` [PATCH 9/9] regulator: qcom-rpm: Implement set_optimum_mode Bjorn Andersson
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=1422413199-17273-4-git-send-email-bjorn.andersson@sonymobile.com \
--to=bjorn.andersson@sonymobile.com \
--cc=agross@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
/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;
as well as URLs for NNTP newsgroup(s).