From patchwork Wed Nov 28 19:27:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\"Rajanikanth H.V" X-Patchwork-Id: 13275 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 E8E4123FCC for ; Wed, 28 Nov 2012 19:30:15 +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 79415A185F3 for ; Wed, 28 Nov 2012 19:30:15 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so8806312ieb.11 for ; Wed, 28 Nov 2012 11:30:15 -0800 (PST) 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:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=kbcAsx4aRe4Ju6xY5QbqSzn/uSBpUtOPri1hgjUdfxA=; b=C+ibHN+unOJ45jt/XQ743S9srFvGNk16yuPrSEABXw6FcbHGFqttYRDDEkTAq1f4kT OOd03AGkGta//EOESQkx2VjNaFrn24z89t4OJO2JHuddso0xm321NHbwVAtphkICDnC/ S/iezhc3JHJz4Afm/ih2vGdf8goZjQdeq6P3hCPaycxBRBvTkxM1spVmfyFuQZJtoY8A kKB6NUVfLu5/ljcbGTuHWK4cU+RkOhlhkANhMx9iu3A8jFG2AqRg2oFdBIql0W87sElq 0ms6x8LGBm0QaYVDukVu8UpyAr5M3QjbdD2vlzRiI1YfNHfySEI+U2jjVk0sFNsZl7rv PGyw== Received: by 10.50.186.199 with SMTP id fm7mr19937014igc.62.1354131014907; Wed, 28 Nov 2012 11:30:14 -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.50.67.148 with SMTP id n20csp720885igt; Wed, 28 Nov 2012 11:30:14 -0800 (PST) Received: by 10.68.237.135 with SMTP id vc7mr61151629pbc.2.1354131013870; Wed, 28 Nov 2012 11:30:13 -0800 (PST) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by mx.google.com with ESMTPS id k9si29892339pay.323.2012.11.28.11.30.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 11:30:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.45 is neither permitted nor denied by best guess record for domain of rajanikanth.hv@linaro.org) client-ip=209.85.220.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.45 is neither permitted nor denied by best guess record for domain of rajanikanth.hv@linaro.org) smtp.mail=rajanikanth.hv@linaro.org Received: by mail-pa0-f45.google.com with SMTP id bg2so7067277pad.4 for ; Wed, 28 Nov 2012 11:30:13 -0800 (PST) Received: by 10.68.136.163 with SMTP id qb3mr60757158pbb.129.1354131013121; Wed, 28 Nov 2012 11:30:13 -0800 (PST) Received: from localhost.localdomain ([117.235.51.54]) by mx.google.com with ESMTPS id wg3sm12879689pbc.28.2012.11.28.11.30.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 11:30:12 -0800 (PST) From: "Rajanikanth H.V" To: anton.vorontsov@linaro.org Cc: francescolavra.fl@gmail.com, rob.herring@calxeda.com, lee.jones@linaro.org, arnd@arndb.de, linus.walleij@stericsson.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-dev@lists.linaro.org, patches@linaro.org, STEricsson_nomadik_linux@list.st.com, rajanikanth.hv@stericsson.com Subject: [PATCH] ab8500: remove explicit handling of battery type Date: Thu, 29 Nov 2012 00:57:45 +0530 Message-Id: <1354130865-6148-1-git-send-email-rajanikanth.hv@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmzWgkc5HGcLnZWMWhqJ8YfAhEIw8/mcQOGczmJ9B3L3MdrYeUDcpBYVIIswWnD+LQalj/v From: "Rajanikanth H.V" property, battery-type shall be one of supported technology type instead blank - refer: Documentation/devicetree/bindings/power_supply/ab8500/fg.txt for the list supported types - this patch appends to ab8500 bm devs DT binding patch set ref: commit-id e0f1abeba5c2d8a2183566717d99294fd1a29c2e git://git.infradead.org/battery-2.6.git - promote ab8500_fg probe to happen before ab8500_btemp probe as btemp driver depends on fuelgauge list, ref: ab8500_fg_get(...) Signed-off-by: Rajanikanth H.V --- drivers/power/Makefile | 2 +- drivers/power/ab8500_bmdata.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 696e3a9..070c73d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_BATTERY_RX51) += rx51_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c index 03cc528..f16b60c 100644 --- a/drivers/power/ab8500_bmdata.c +++ b/drivers/power/ab8500_bmdata.c @@ -461,7 +461,6 @@ bmdevs_of_probe(struct device *dev, struct device_node *np_bat_supply; struct abx500_bm_data *bat; const char *btech; - char bat_tech[8]; int i, thermistor; *battery = &ab8500_bm_data; @@ -488,12 +487,9 @@ bmdevs_of_probe(struct device *dev, "stericsson,battery-type", NULL); if (!btech) { dev_warn(dev, "missing property battery-name/type\n"); - strcpy(bat_tech, "UNKNOWN"); - } else { - strcpy(bat_tech, btech); + return -EINVAL; } - - if (strncmp(bat_tech, "LION", 4) == 0) { + if (strncmp(btech, "LION", 4) == 0) { bat->no_maintenance = true; bat->chg_unknown_bat = true; bat->bat_type[BATTERY_UNKNOWN].charge_full_design = 2600; @@ -508,7 +504,7 @@ bmdevs_of_probe(struct device *dev, if (thermistor == NTC_EXTERNAL) { btype->batres_tbl = temp_to_batres_tbl_ext_thermistor; - } else if (strncmp(bat_tech, "LION", 4) == 0) { + } else if (strncmp(btech, "LION", 4) == 0) { btype->batres_tbl = temp_to_batres_tbl_9100; } else {