regulator: ab8500-ext: Remove get_voltage to avoid duplicate implementation
authorAxel Lin <axel.lin@ingics.com>
Sun, 7 Apr 2013 15:17:50 +0000 (23:17 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Apr 2013 10:23:56 +0000 (11:23 +0100)
The implementation of ab8500_ext_fixed_get_voltage is identical to
ab8500_ext_list_voltage. We can avoid the duplicate implementation by just
remove get_voltage. For fixed regulator, regulator core will call
list_voltage(rdev, 0) to get voltage if both get_voltage get_voltage_sel are
not implemented.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/ab8500-ext.c

index c7896af..9aee21c 100644 (file)
@@ -237,21 +237,6 @@ static unsigned int ab8500_ext_regulator_get_mode(struct regulator_dev *rdev)
        return ret;
 }
 
-static int ab8500_ext_fixed_get_voltage(struct regulator_dev *rdev)
-{
-       struct regulation_constraints *regu_constraints = rdev->constraints;
-
-       if (regu_constraints == NULL) {
-               dev_err(rdev_get_dev(rdev), "regulator constraints null pointer\n");
-               return -EINVAL;
-       }
-       if (regu_constraints->min_uV && regu_constraints->max_uV) {
-               if (regu_constraints->min_uV == regu_constraints->max_uV)
-                       return regu_constraints->min_uV;
-       }
-       return -EINVAL;
-}
-
 static int ab8500_ext_list_voltage(struct regulator_dev *rdev,
                                   unsigned selector)
 {
@@ -275,7 +260,6 @@ static struct regulator_ops ab8500_ext_regulator_ops = {
        .is_enabled             = ab8500_ext_regulator_is_enabled,
        .set_mode               = ab8500_ext_regulator_set_mode,
        .get_mode               = ab8500_ext_regulator_get_mode,
-       .get_voltage            = ab8500_ext_fixed_get_voltage,
        .list_voltage           = ab8500_ext_list_voltage,
 };