aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-10-24 05:06:07 -0400
committerLee Jones <lee.jones@linaro.org>2013-03-06 23:35:54 -0500
commit3c01b3676f3fa3813b02742a1816c9d2eff1b27e (patch)
tree38c86a954beb314c4bf779188ba64104c5218d3d /drivers/power
parent1ee26af028a46cf911f844c062b3c810bac34366 (diff)
ab8500-charger: Remove duplicate code
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_charger.c8
-rw-r--r--drivers/power/ab8500_fg.c1
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 853002843984..81c9615fd726 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -3184,14 +3184,6 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di)
3184 goto out; 3184 goto out;
3185 } 3185 }
3186 3186
3187 /* Set charger watchdog timeout */
3188 ret = abx500_set_register_interruptible(di->dev, AB8500_CHARGER,
3189 AB8500_CH_WD_TIMER_REG, WD_TIMER);
3190 if (ret) {
3191 dev_err(di->dev, "failed to set charger watchdog timeout\n");
3192 goto out;
3193 }
3194
3195 ret = ab8500_charger_led_en(di, false); 3187 ret = ab8500_charger_led_en(di, false);
3196 if (ret < 0) { 3188 if (ret < 0) {
3197 dev_err(di->dev, "failed to disable LED\n"); 3189 dev_err(di->dev, "failed to disable LED\n");
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index d1f93098a412..466ec6292d73 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -1680,7 +1680,6 @@ static void ab8500_fg_algorithm_discharging(struct ab8500_fg *di)
1680 break; 1680 break;
1681 1681
1682 case AB8500_FG_DISCHARGE_WAKEUP: 1682 case AB8500_FG_DISCHARGE_WAKEUP:
1683 ab8500_fg_coulomb_counter(di, true);
1684 ab8500_fg_calc_cap_discharge_voltage(di, true); 1683 ab8500_fg_calc_cap_discharge_voltage(di, true);
1685 1684
1686 di->fg_samples = SEC_TO_SAMPLE( 1685 di->fg_samples = SEC_TO_SAMPLE(