From: Wenyou Yang <wenyou.yang@atmel.com>
To: Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Brown <broonie@kernel.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
"Kumar Gala" <galak@codeaurora.org>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
<linux-pm@vger.kernel.org>, Wenyou Yang <wenyou.yang@atmel.com>
Subject: [PATCH 1/7] power: act8945a_charger: Remove "battery_temperature"
Date: Fri, 24 Jun 2016 15:17:34 +0800 [thread overview]
Message-ID: <1466752660-2922-2-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1466752660-2922-1-git-send-email-wenyou.yang@atmel.com>
Remove "battery_temperature" member, it is redundant, it is the
hardware's responsibility to handle TH pin properly.
It is unnecessary to use the dt property to check if there is
a battery temperature monitor or not.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
drivers/power/act8945a_charger.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/power/act8945a_charger.c b/drivers/power/act8945a_charger.c
index b5c00e4..72d39ba 100644
--- a/drivers/power/act8945a_charger.c
+++ b/drivers/power/act8945a_charger.c
@@ -76,7 +76,6 @@ static const char *act8945a_charger_manufacturer = "Active-semi";
struct act8945a_charger {
struct regmap *regmap;
- bool battery_temperature;
};
static int act8945a_get_charger_state(struct regmap *regmap, int *val)
@@ -138,8 +137,7 @@ static int act8945a_get_charge_type(struct regmap *regmap, int *val)
return 0;
}
-static int act8945a_get_battery_health(struct act8945a_charger *charger,
- struct regmap *regmap, int *val)
+static int act8945a_get_battery_health(struct regmap *regmap, int *val)
{
int ret;
unsigned int status;
@@ -148,7 +146,7 @@ static int act8945a_get_battery_health(struct act8945a_charger *charger,
if (ret < 0)
return ret;
- if (charger->battery_temperature && !(status & APCH_STATUS_TEMPDAT))
+ if (status & APCH_STATUS_TEMPDAT)
*val = POWER_SUPPLY_HEALTH_OVERHEAT;
else if (!(status & APCH_STATUS_INDAT))
*val = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
@@ -188,8 +186,7 @@ static int act8945a_charger_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
break;
case POWER_SUPPLY_PROP_HEALTH:
- ret = act8945a_get_battery_health(charger,
- regmap, &val->intval);
+ ret = act8945a_get_battery_health(regmap, &val->intval);
break;
case POWER_SUPPLY_PROP_MODEL_NAME:
val->strval = act8945a_charger_model;
@@ -235,9 +232,6 @@ static int act8945a_charger_config(struct device *dev,
return -EINVAL;
}
- charger->battery_temperature = of_property_read_bool(np,
- "active-semi,check-battery-temperature");
-
chglev_pin = of_get_named_gpio_flags(np,
"active-semi,chglev-gpios", 0, &flags);
--
2.7.4
next prev parent reply other threads:[~2016-06-24 7:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 7:17 [PATCH 0/7] power: act8945a_charger: Improvements Wenyou Yang
2016-06-24 7:17 ` Wenyou Yang [this message]
2016-06-24 7:17 ` [PATCH 2/7] power: act8945a_charger: Improve Wenyou Yang
2016-06-24 11:22 ` kbuild test robot
2016-06-24 12:43 ` kbuild test robot
2016-06-24 12:43 ` [PATCH] power: act8945a_charger: fix semicolon.cocci warnings kbuild test robot
2016-06-28 1:34 ` Yang, Wenyou
2016-07-29 0:57 ` Yang, Wenyou
2016-07-29 1:01 ` [kbuild-all] " Fengguang Wu
2016-06-24 7:17 ` [PATCH 3/7] power: act8945a_charger: Add status change update support Wenyou Yang
2016-06-24 7:17 ` [PATCH 4/7] power: act8945a_charger: Fix the power supply type Wenyou Yang
2016-06-24 7:17 ` [PATCH 5/7] power: act8945a_charger: Add capacity level property Wenyou Yang
2016-06-24 7:17 ` [PATCH 6/7] power: act8945a_charger: Add max current property Wenyou Yang
2016-06-24 7:17 ` [PATCH 7/7] doc: bindings: act8945a-charger: Update properties Wenyou Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466752660-2922-2-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=broonie@kernel.org \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).