From patchwork Thu Sep 27 20:09:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11818 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 9B98524140 for ; Thu, 27 Sep 2012 20:10:23 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4B7A3A18968 for ; Thu, 27 Sep 2012 20:10:23 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5234855iej.11 for ; Thu, 27 Sep 2012 13:10:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=IKpuLz70l6Fwj6Wp0Cz7QzoIpx8B5nD2TYuV1Q91mvE=; b=CXinYWILGgpBwMDa314nglGKCxkk2eqyvSdwvtOpIryc0GM/fum4CxxWcX9ZzmgnbV 5lU/aPbB+HLkFullbyFCwGpf1kAXAWV15w3D4/ZKRtTrpqL9QmtAf6MF72ymD61LssaZ V/hB6GuEady7qzv1yq+jIdu8gUWw0qiJazOPrtdpwp5S9lFyz3Req1kK6B9rwdFV5cLf evni8Tzd1ZKs547ENH8Md8PYqB0USKFrx+7rofnA0KFieUwwBqjRwi1TtSaS6eHCUmpb 3ozCH/cKa8/GeSBXffyLvK2Pvliyv+K4XoXpA49LRWGSFG6F8f/X9lS4QgBxL/i7iY5Q IqMg== Received: by 10.50.217.227 with SMTP id pb3mr15359630igc.28.1348776623077; Thu, 27 Sep 2012 13:10:23 -0700 (PDT) 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.50.184.232 with SMTP id ex8csp436380igc; Thu, 27 Sep 2012 13:10:20 -0700 (PDT) Received: by 10.66.78.199 with SMTP id d7mr11997561pax.77.1348776620553; Thu, 27 Sep 2012 13:10:20 -0700 (PDT) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id vn9si8390651pbc.17.2012.09.27.13.10.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:10:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) client-ip=209.85.220.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) smtp.mail=mathieu.poirier@linaro.org Received: by mail-pa0-f50.google.com with SMTP id hz11so1847989pad.37 for ; Thu, 27 Sep 2012 13:10:20 -0700 (PDT) Received: by 10.66.87.105 with SMTP id w9mr12180447paz.5.1348776620342; Thu, 27 Sep 2012 13:10:20 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id sa2sm1587890pbc.4.2012.09.27.13.10.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:10:19 -0700 (PDT) From: mathieu.poirier@linaro.org To: patches@linaro.org Subject: [PATCH 44/57] power: ab8500: remove unecesary define flag Date: Thu, 27 Sep 2012 14:09:01 -0600 Message-Id: <1348776554-10019-45-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348776554-10019-1-git-send-email-mathieu.poirier@linaro.org> References: <1348776554-10019-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQnP8v50RUfB/bjWpY0Y8d4fDI4o+AXzcDuk+VMU2ZlJUud0l1quKHoLspu70HrE/TTE339b From: Marcus Cooper Remove flag that serve no purpose from source code, Kconfig and Makefile. Signed-off-by: Marcus Cooper Signed-off-by: Mathieu Poirier Reviewed-by: Hakan BERG Reviewed-by: Mian Yousaf KAUKAB --- drivers/power/Kconfig | 7 ------- drivers/power/ab8500_charger.c | 2 +- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index c1892f3..f7c13ae 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -303,13 +303,6 @@ config AB8500_BM depends on AB8500_CORE && AB8500_GPADC help Say Y to include support for AB8500 battery management. - -config AB8500_BATTERY_THERM_ON_BATCTRL - bool "Thermistor connected on BATCTRL ADC" - depends on AB8500_BM - help - Say Y to enable battery temperature measurements using - thermistor connected on BATCTRL ADC. endif # POWER_SUPPLY source "drivers/power/avs/Kconfig" diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index 9449a33..d90fe9f 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -3369,7 +3369,7 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev) flush_scheduled_work(); if (di->usb_chg.enabled) power_supply_unregister(&di->usb_chg.psy); - if (di->ac_chg.enabled) + if (di->ac_chg.enabled && !di->ac_chg.external) power_supply_unregister(&di->ac_chg.psy); platform_set_drvdata(pdev, NULL);