ab8500-charger: Remove duplicate code

Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 85300284398424350c43e2253dfaabae95ba3762..81c9615fd72601963254709a132cd862d41a6d2f 100644 (file)
--- 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)
                goto out;
        }
 
-       /* Set charger watchdog timeout */
-       ret = abx500_set_register_interruptible(di->dev, AB8500_CHARGER,
-               AB8500_CH_WD_TIMER_REG, WD_TIMER);
-       if (ret) {
-               dev_err(di->dev, "failed to set charger watchdog timeout\n");
-               goto out;
-       }
-
        ret = ab8500_charger_led_en(di, false);
        if (ret < 0) {
                dev_err(di->dev, "failed to disable LED\n");

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index d1f93098a41222b0805ef777be981a80cef2469f..466ec6292d735ad18b7a1c61ad50d7465be2f27f 100644 (file)
--- 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)
                break;
 
        case AB8500_FG_DISCHARGE_WAKEUP:
-               ab8500_fg_coulomb_counter(di, true);
                ab8500_fg_calc_cap_discharge_voltage(di, true);
 
                di->fg_samples = SEC_TO_SAMPLE(