[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1353689452.3260.4.camel@phoenix>
Date: Sat, 24 Nov 2012 00:50:52 +0800
From: Axel Lin <axel.lin@...ics.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@....de>,
Liam Girdwood <lrg@...com>, linux-kernel@...r.kernel.org
Subject: [PATCH 1/2] regulator: as3711: Fix valid min_uV/max_UV checking in
as3711_bound_check
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@...ics.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists