From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/18] power: ab8500_charger: Handle gpadc errors
Date: Fri, 11 Jan 2013 13:12:53 +0000 [thread overview]
Message-ID: <1357909986-9262-6-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1357909986-9262-1-git-send-email-lee.jones@linaro.org>
From: Jonas Aaberg <jonas.aberg@stericsson.com>
Gracefully handle gpadc conversion errors.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-by: Johan BJORNSTEDT <johan.bjornstedt@stericsson.com>
---
drivers/power/ab8500_charger.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index bbf7782e..919d156 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -160,6 +160,7 @@ struct ab8500_charger_info {
int charger_voltage;
int cv_active;
bool wd_expired;
+ int charger_current;
};
struct ab8500_charger_event_flags {
@@ -2358,6 +2359,7 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy,
union power_supply_propval *val)
{
struct ab8500_charger *di;
+ int ret;
di = to_ab8500_charger_ac_device_info(psy_to_ux500_charger(psy));
@@ -2379,7 +2381,10 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy,
val->intval = di->ac.charger_connected;
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
- di->ac.charger_voltage = ab8500_charger_get_ac_voltage(di);
+ ret = ab8500_charger_get_ac_voltage(di);
+ if (ret >= 0)
+ di->ac.charger_voltage = ret;
+ /* On error, use previous value */
val->intval = di->ac.charger_voltage * 1000;
break;
case POWER_SUPPLY_PROP_VOLTAGE_AVG:
@@ -2391,7 +2396,10 @@ static int ab8500_charger_ac_get_property(struct power_supply *psy,
val->intval = di->ac.cv_active;
break;
case POWER_SUPPLY_PROP_CURRENT_NOW:
- val->intval = ab8500_charger_get_ac_current(di) * 1000;
+ ret = ab8500_charger_get_ac_current(di);
+ if (ret >= 0)
+ di->ac.charger_current = ret;
+ val->intval = di->ac.charger_current * 1000;
break;
default:
return -EINVAL;
@@ -2418,6 +2426,7 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy,
union power_supply_propval *val)
{
struct ab8500_charger *di;
+ int ret;
di = to_ab8500_charger_usb_device_info(psy_to_ux500_charger(psy));
@@ -2441,7 +2450,9 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy,
val->intval = di->usb.charger_connected;
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
- di->usb.charger_voltage = ab8500_charger_get_vbus_voltage(di);
+ ret = ab8500_charger_get_vbus_voltage(di);
+ if (ret >= 0)
+ di->usb.charger_voltage = ret;
val->intval = di->usb.charger_voltage * 1000;
break;
case POWER_SUPPLY_PROP_VOLTAGE_AVG:
@@ -2453,7 +2464,10 @@ static int ab8500_charger_usb_get_property(struct power_supply *psy,
val->intval = di->usb.cv_active;
break;
case POWER_SUPPLY_PROP_CURRENT_NOW:
- val->intval = ab8500_charger_get_usb_current(di) * 1000;
+ ret = ab8500_charger_get_usb_current(di);
+ if (ret >= 0)
+ di->usb.charger_current = ret;
+ val->intval = di->usb.charger_current * 1000;
break;
case POWER_SUPPLY_PROP_CURRENT_AVG:
/*
--
1.7.9.5
next prev parent reply other threads:[~2013-01-11 13:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 13:12 [PATCH 00/18] AB8500 battery management series upgrade Lee Jones
2013-01-11 13:12 ` [PATCH 01/18] power: ab8500_charger: Rename the power_loss function Lee Jones
2013-01-11 13:12 ` [PATCH 02/18] power: ab8500_bm: Skip first CCEOC irq for instant current Lee Jones
2013-01-11 13:12 ` [PATCH 03/18] power: ab8500_charger: Detect charger removal Lee Jones
2013-01-16 1:36 ` Anton Vorontsov
2013-01-16 8:48 ` Lee Jones
2013-01-11 13:12 ` [PATCH 04/18] power: ab8500_fg: Replace msleep() with usleep_range() for greater accuracy Lee Jones
2013-01-14 17:17 ` Joe Perches
2013-01-15 8:48 ` Lee Jones
2013-01-15 8:59 ` Linus Walleij
2013-01-15 13:23 ` Arnd Bergmann
2013-01-15 13:52 ` Lee Jones
2013-01-15 14:09 ` Lee Jones
2013-01-11 13:12 ` Lee Jones [this message]
2013-01-11 13:12 ` [PATCH 06/18] power: ab8500_bm: Recharge condition not optimal for battery Lee Jones
2013-01-16 1:44 ` Anton Vorontsov
2013-01-16 8:47 ` Lee Jones
2013-01-11 13:12 ` [PATCH 07/18] power: ab8500_fg: balance IRQ enable Lee Jones
2013-01-11 13:12 ` [PATCH 08/18] power: ab8500_btemp: Allign battery temperature resolution with the framework Lee Jones
2013-01-11 13:12 ` [PATCH 09/18] power: ab8500_btemp: Ignore false btemp low interrupt Lee Jones
2013-01-11 13:12 ` [PATCH 10/18] power: ab8500_bm: Adds support for Car/Travel Adapters Lee Jones
2013-01-11 13:12 ` [PATCH 11/18] power: ab8500_fg: Round capacity output Lee Jones
2013-01-11 13:13 ` [PATCH 12/18] power: ab8500_btemp: remove superfluous BTEMP thermal comp Lee Jones
2013-01-11 13:13 ` [PATCH 13/18] power: ab8500_fg: Added support for BATT_OVV Lee Jones
2013-01-11 13:13 ` [PATCH 14/18] power: pm2301: Add pm2301 charger Lee Jones
2013-01-16 1:37 ` Anton Vorontsov
2013-01-11 13:13 ` [PATCH 15/18] power: ab8500_charger: remove unused defines Lee Jones
2013-01-11 13:13 ` [PATCH 16/18] power: ab8500_charger: Adds support for legacy USB chargers Lee Jones
2013-01-11 13:13 ` [PATCH 17/18] Power: ab8500_fg: Overflow in current calculation Lee Jones
2013-01-11 13:13 ` [PATCH 18/18] power: ab8500_fg: Remove pointless round_jiffies() call Lee Jones
2013-01-16 1:48 ` [PATCH 00/18] AB8500 battery management series upgrade Anton Vorontsov
2013-01-16 8:50 ` Lee Jones
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=1357909986-9262-6-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).