summary refs log tree commit diff
path: root/drivers/power/ab8500_charger.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-10-24 11:06:07 +0200
committerLee Jones <lee.jones@linaro.org>2013-03-07 12:35:54 +0800
commit3c01b3676f3fa3813b02742a1816c9d2eff1b27e (patch)
tree38c86a954beb314c4bf779188ba64104c5218d3d /drivers/power/ab8500_charger.c
parent1ee26af028a46cf911f844c062b3c810bac34366 (diff)
downloadlinux-3c01b3676f3fa3813b02742a1816c9d2eff1b27e.tar.gz
ab8500-charger: Remove duplicate code
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power/ab8500_charger.c')
-rw-r--r--drivers/power/ab8500_charger.c8
1 files changed, 0 insertions, 8 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)
 		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");