All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Lee Jones <lee.jones@linaro.org>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] regulator: st-pwm: Convert to get_voltage_sel
Date: Sat, 22 Mar 2014 07:22:38 +0800	[thread overview]
Message-ID: <1395444158.25974.1.camel@phoenix> (raw)

Also remove test for selector in st_pwm_regulator_set_voltage_sel, the checking
is already done in .list_voltage.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/regulator/st-pwm.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/regulator/st-pwm.c b/drivers/regulator/st-pwm.c
index 6ef569f..e367af1 100644
--- a/drivers/regulator/st-pwm.c
+++ b/drivers/regulator/st-pwm.c
@@ -39,11 +39,11 @@ struct st_pwm_voltages {
 	unsigned int dutycycle;
 };
 
-static int st_pwm_regulator_get_voltage(struct regulator_dev *dev)
+static int st_pwm_regulator_get_voltage_sel(struct regulator_dev *dev)
 {
 	struct st_pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
 
-	return drvdata->pdata->duty_cycle_table[drvdata->state].uV;
+	return drvdata->state;
 }
 
 static int st_pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
@@ -53,9 +53,6 @@ static int st_pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
 	int dutycycle;
 	int ret;
 
-	if (selector >= dev->desc->n_voltages)
-		return -EINVAL;
-
 	dutycycle = (ST_PWM_REG_PERIOD / 100) *
 		drvdata->pdata->duty_cycle_table[selector].dutycycle;
 
@@ -92,7 +89,7 @@ static int st_pwm_regulator_list_voltage(struct regulator_dev *dev,
 
 static struct regulator_ops st_pwm_regulator_voltage_ops = {
 	.set_voltage_sel = st_pwm_regulator_set_voltage_sel,
-	.get_voltage     = st_pwm_regulator_get_voltage,
+	.get_voltage_sel = st_pwm_regulator_get_voltage_sel,
 	.list_voltage    = st_pwm_regulator_list_voltage,
 	.map_voltage     = regulator_map_voltage_iterate,
 };
-- 
1.8.3.2




             reply	other threads:[~2014-03-21 23:22 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-21 23:22 Axel Lin [this message]
2014-03-24  8:36 ` [PATCH] regulator: st-pwm: Convert to get_voltage_sel Lee Jones
2014-03-24 10:49 ` Mark Brown

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=1395444158.25974.1.camel@phoenix \
    --to=axel.lin@ingics.com \
    --cc=broonie@kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.