regulator: ab8500: Remove the need for a 'delay' property
authorLee Jones <lee.jones@linaro.org>
Tue, 2 Apr 2013 12:24:17 +0000 (13:24 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:40:27 +0000 (18:40 +0100)
The regulator framework now has provisions to read a regulator's
start-up time via the 'enable_time' attribute. So let's remove all
'enable_time'/'delay' duplication and just stick with 'enable_time'
from now on.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/ab8500.c

index 8a9cd45eac028b314847f4092a8ee75f1cf42954..7892a516d07485f556bd05ef03f39c302ef52fff 100644 (file)
@@ -654,7 +654,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 {
        struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
 
-       return info->delay;
+       return info->desc.enable_time;
 }
 
 static struct regulator_ops ab8500_regulator_volt_mode_ops = {
@@ -1108,7 +1108,6 @@ static struct ab8500_regulator_info
                        .volt_table     = fixed_2000000_voltage,
                        .enable_time    = 10000,
                },
-               .delay                  = 10000,
                .load_lp_uA             = 1000,
                .update_bank            = 0x03,
                .update_reg             = 0x80,
@@ -1374,7 +1373,6 @@ static struct ab8500_regulator_info
                        .volt_table     = fixed_2000000_voltage,
                        .enable_time    = 10000,
                },
-               .delay                  = 10000,
                .load_lp_uA             = 1000,
                .update_bank            = 0x03,
                .update_reg             = 0x80,
@@ -1672,7 +1670,6 @@ static struct ab8500_regulator_info
                        .n_voltages     = 1,
                        .enable_time    = 10000,
                },
-               .delay                  = 10000,
                .load_lp_uA             = 1000,
                .update_bank            = 0x03,
                .update_reg             = 0x80,