From 16ed9f0701d2bb06d96754ba1d3edbf9aa5faeef Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 24 Nov 2012 00:50:52 +0800 Subject: 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 Acked-by: Guennadi Liakhovetski Signed-off-by: Mark Brown --- drivers/regulator/as3711-regulator.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers/regulator') diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c index 81578bf7e352..5e813b9059e7 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) -- cgit v1.2.3