From patchwork Fri Feb 15 12:45:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14879 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4359F23E2E for ; Fri, 15 Feb 2013 12:47:05 +0000 (UTC) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by fiordland.canonical.com (Postfix) with ESMTP id EA3B5A1828F for ; Fri, 15 Feb 2013 12:47:04 +0000 (UTC) Received: by mail-ve0-f181.google.com with SMTP id d10so2913495vea.26 for ; Fri, 15 Feb 2013 04:47:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=Haq8pXQz8AKuFV1/zN1CCzHhNYaHduuUU0b7IMeFS8w=; b=llMjh+9RRQM3HfU9yidV+ogXVWIIZlyCyayBBTKosLL5Lge8Ljbl3FcJjtc9RygODA K24kM40fT5Z5Ge2Q7KCSldC8rvJAACSOqDHrUVGj26K1PBLct3WUB7PrzrMU6XeiI1qy nCcPgPT88NJsDV1+t7NHIGa2mI1g+ny2uqQNhJsQKcaJDRgn8FWQ2H1NcDkioKvVFvvA 3+q5NlhfQYj0UoW0SfsSBliHdt/QlPtPIyOp5De/Ln6nvP2oQMGjZEzQwR2DD+NVwIji /SNWLzrGFdzw4bBq4o0CGA6vccjTcr+DN9Sh2FvqZk84NQTQqzdSb8pvlU2OUrV7/jxr +eSw== X-Received: by 10.58.213.37 with SMTP id np5mr2830088vec.54.1360932424482; Fri, 15 Feb 2013 04:47:04 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp10911vcb; Fri, 15 Feb 2013 04:47:04 -0800 (PST) X-Received: by 10.194.86.38 with SMTP id m6mr4067683wjz.13.1360932421025; Fri, 15 Feb 2013 04:47:01 -0800 (PST) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by mx.google.com with ESMTPS id h17si1027876wiw.123.2013.02.15.04.47.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:47:01 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.44 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.44; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.44 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f44.google.com with SMTP id dr12so2687959wgb.23 for ; Fri, 15 Feb 2013 04:47:00 -0800 (PST) X-Received: by 10.194.172.197 with SMTP id be5mr4010019wjc.20.1360932412420; Fri, 15 Feb 2013 04:46:52 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id bs6sm5133904wib.4.2013.02.15.04.46.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:46:51 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, sameo@linux.intel.com, Lee Jones Subject: [PATCH 32/40] ab8500-charger: Remove duplicate code Date: Fri, 15 Feb 2013 12:45:02 +0000 Message-Id: <1360932310-30065-33-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> References: <1360932310-30065-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnCLhfhGb18gRvINHY7EDMCCwbWWCtJDG/JrM/UNiAQVo1g4mnWqj3n4Cl/rFCc/GpayOcB Signed-off-by: Lee Jones --- drivers/power/ab8500_charger.c | 8 -------- drivers/power/ab8500_fg.c | 1 - 2 files changed, 9 deletions(-) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index 8530028..81c9615 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"); diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index f596883..54c6417 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) 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(