public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
	Liam Girdwood <lrg@ti.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] regulator: as3711: Fix valid min_uV/max_UV checking in as3711_bound_check
Date: Sat, 24 Nov 2012 00:50:52 +0800	[thread overview]
Message-ID: <1353689452.3260.4.camel@phoenix> (raw)

Below cases are supposed to be valid:

min_uV == max_uV == info->max_uV
min_uV == max_uV == rdev->desc->min_uV

Don't return -EINVAL for above cases.

This patch also includes below cleanups:
- Use rdev_get_drvdata(rdev) instead of rdev->reg_data.
- Remove unnecessary WARN_ON, it looks pointless.

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

diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
index 81578bf..5e813b9 100644
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -69,17 +69,14 @@ static int as3711_list_voltage_dldo(struct regulator_dev *rdev,
 static int as3711_bound_check(struct regulator_dev *rdev,
 			      int *min_uV, int *max_uV)
 {
-	struct as3711_regulator_info *info = container_of(rdev->desc,
-					struct as3711_regulator_info, desc);
-	struct as3711_regulator *reg = rdev->reg_data;
-
-	WARN_ON(reg->reg_info != info);
+	struct as3711_regulator *reg = rdev_get_drvdata(rdev);
+	struct as3711_regulator_info *info = reg->reg_info;
 
 	dev_dbg(&rdev->dev, "%s(), %d, %d, %d\n", __func__,
 		*min_uV, rdev->desc->min_uV, info->max_uV);
 
 	if (*max_uV < *min_uV ||
-	    *min_uV >= info->max_uV || rdev->desc->min_uV >= *max_uV)
+	    *min_uV > info->max_uV || rdev->desc->min_uV > *max_uV)
 		return -EINVAL;
 
 	if (rdev->desc->n_voltages == 1)
-- 
1.7.9.5




             reply	other threads:[~2012-11-23 16:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-23 16:50 Axel Lin [this message]
2012-11-23 16:53 ` [PATCH 2/2] regulator: as3711: Fix the logic in as3711_sel_check Axel Lin
2012-11-26 13:46   ` Guennadi Liakhovetski
2012-11-26 13:45 ` [PATCH 1/2] regulator: as3711: Fix valid min_uV/max_UV checking in as3711_bound_check Guennadi Liakhovetski
2012-11-27 20:25 ` 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=1353689452.3260.4.camel@phoenix \
    --to=axel.lin@ingics.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=g.liakhovetski@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.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