LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Rodolfo Giometti <giometti@linux.it>,
Grazvydas Ignotas <notasas@gmail.com>,
linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 04/14] POWER: bq27x00: Return -ENODEV for properties if the battery is not present
Date: Sun, 6 Feb 2011 01:48:01 +0100 [thread overview]
Message-ID: <1296953291-10373-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1296953291-10373-1-git-send-email-lars@metafoo.de>
This patch changes get_property callback of the bq27x00 battery to return
-ENODEV for properties other then the PROP_PRESENT if the battery is not
present.
The power subsystem core expects a driver to behave that way.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/power/bq27x00_battery.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 1b06134..9f16666 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -252,16 +252,21 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
{
int ret = 0;
struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
+ int voltage = bq27x00_battery_voltage(di);
+
+ if (psp != POWER_SUPPLY_PROP_PRESENT && voltage <= 0)
+ return -ENODEV;
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
ret = bq27x00_battery_status(di, val);
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+ val->intval = voltage;
+ break;
case POWER_SUPPLY_PROP_PRESENT:
- val->intval = bq27x00_battery_voltage(di);
if (psp == POWER_SUPPLY_PROP_PRESENT)
- val->intval = val->intval <= 0 ? 0 : 1;
+ val->intval = voltage <= 0 ? 0 : 1;
break;
case POWER_SUPPLY_PROP_CURRENT_NOW:
val->intval = bq27x00_battery_current(di);
--
1.7.2.3
next prev parent reply other threads:[~2011-02-06 19:39 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 0:47 [PATCH 00/14] POWER: BQ27x00: New Properties, fixes, bq27000 support Lars-Peter Clausen
2011-02-06 0:47 ` [PATCH 01/14] POWER: bq27x00: Add type property Lars-Peter Clausen
2011-02-06 16:43 ` Rodolfo Giometti
2011-02-06 0:47 ` [PATCH 02/14] POWER: bq27x00: Improve temperature precession Lars-Peter Clausen
2011-02-07 8:06 ` Rodolfo Giometti
2011-02-06 0:48 ` [PATCH 03/14] POWER: bq27x00: Fix current now property Lars-Peter Clausen
2011-02-07 8:07 ` Rodolfo Giometti
2011-02-06 0:48 ` Lars-Peter Clausen [this message]
2011-02-06 16:40 ` [PATCH 04/14] POWER: bq27x00: Return -ENODEV for properties if the battery is not present Rodolfo Giometti
2011-02-06 0:48 ` [PATCH 05/14] POWER: bq27x00: Prepare code for addition of bq27000 platform driver Lars-Peter Clausen
2011-02-07 8:09 ` Rodolfo Giometti
2011-02-06 0:48 ` [PATCH 06/14] POWER: bq27x00: Add bq27000 support Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 07/14] POWER: bq27X00: Cache battery registers Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 08/14] POWER: bq27x00: Poll battery state Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 09/14] POWER: bq27x00: Add new properties Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 10/14] POWER: bq27x00: Add MODULE_DEVICE_TABLE Lars-Peter Clausen
2011-02-06 16:49 ` Rodolfo Giometti
2011-02-06 0:48 ` [PATCH 11/14] POWER: bq27x00: Give more specific reports on battery status Lars-Peter Clausen
2011-02-06 16:38 ` Rodolfo Giometti
2011-02-06 0:48 ` [PATCH 12/14] POWER: bq27x00: Minor cleanups Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 13/14] POWER: bq27x00: Cleanup bq27x00_i2c_read Lars-Peter Clausen
2011-02-06 0:48 ` [PATCH 14/14] POWER: Ignore -ENODATA errors when generating a uevent Lars-Peter Clausen
2011-02-06 22:47 ` [PATCH 00/14] POWER: BQ27x00: New Properties, fixes, bq27000 support Felipe Contreras
2011-02-06 23:09 ` Lars-Peter Clausen
2011-02-07 0:00 ` Felipe Contreras
2011-02-07 0:12 ` Lars-Peter Clausen
2011-02-07 10:52 ` Pali Rohár
2011-02-07 0:58 ` Grazvydas Ignotas
2011-02-07 1:30 ` Lars-Peter Clausen
2011-02-08 11:40 ` Grazvydas Ignotas
2011-02-08 16:13 ` Lars-Peter Clausen
2011-02-08 16:28 ` Anton Vorontsov
2011-02-08 17:09 ` Lars-Peter Clausen
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=1296953291-10373-5-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=cbouatmailru@gmail.com \
--cc=giometti@linux.it \
--cc=linux-kernel@vger.kernel.org \
--cc=notasas@gmail.com \
--subject='Re: [PATCH 04/14] POWER: bq27x00: Return -ENODEV for properties if the battery is not present' \
/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
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).