[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1296953291-10373-9-git-send-email-lars@metafoo.de>
Date: Sun, 6 Feb 2011 01:48:05 +0100
From: Lars-Peter Clausen <lars@...afoo.de>
To: Anton Vorontsov <cbouatmailru@...il.com>
Cc: Rodolfo Giometti <giometti@...ux.it>,
Grazvydas Ignotas <notasas@...il.com>,
linux-kernel@...r.kernel.org, Lars-Peter Clausen <lars@...afoo.de>
Subject: [PATCH 08/14] POWER: bq27x00: Poll battery state
This patch adds support for polling the battery state and generating a
power_supply_changed() event if it has changed.
Signed-off-by: Lars-Peter Clausen <lars@...afoo.de>
---
drivers/power/bq27x00_battery.c | 47 +++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index cabc7c9..0dc7771 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/param.h>
#include <linux/jiffies.h>
+#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
@@ -74,6 +75,7 @@ struct bq27x00_device_info {
struct bq27x00_reg_cache cache;
unsigned long last_update;
+ struct delayed_work work;
struct power_supply bat;
@@ -93,6 +95,11 @@ static enum power_supply_property bq27x00_battery_props[] = {
POWER_SUPPLY_PROP_TECHNOLOGY,
};
+static unsigned int poll_interval = 360;
+module_param(poll_interval, uint, 0644);
+MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \
+ "0 disables polling");
+
/*
* Common code for BQ27x00 devices
*/
@@ -282,7 +289,7 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
if (time_is_before_jiffies(di->last_update + 6 * HZ))
- bq27x00_update(di);
+ flush_delayed_work_sync(&di->work);
if (psp != POWER_SUPPLY_PROP_PRESENT && di->cache.voltage <= 0)
return -ENODEV;
@@ -325,6 +332,28 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
return ret;
}
+static void bq27x00_battery_work(struct work_struct *work)
+{
+ struct bq27x00_device_info *di =
+ container_of(work, struct bq27x00_device_info, work.work);
+
+ bq27x00_update(di);
+
+ if (poll_interval > 0) {
+ /* The timer does not have to be accurate. */
+ set_timer_slack(&di->work.timer, poll_interval * HZ / 4);
+ schedule_delayed_work(&di->work, poll_interval * HZ);
+ }
+}
+
+static void bq27x00_external_power_changed(struct power_supply *psy)
+{
+ struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
+
+ cancel_delayed_work_sync(&di->work);
+ schedule_delayed_work(&di->work, 0);
+}
+
static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
{
int ret;
@@ -333,7 +362,9 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
di->bat.properties = bq27x00_battery_props;
di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
di->bat.get_property = bq27x00_battery_get_property;
- di->bat.external_power_changed = NULL;
+ di->bat.external_power_changed = bq27x00_external_power_changed;
+
+ INIT_DELAYED_WORK(&di->work, bq27x00_battery_work);
ret = power_supply_register(di->dev, &di->bat);
if (ret) {
@@ -348,6 +379,13 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
return 0;
}
+static void bq27x00_powersupply_unregister(struct bq27x00_device_info *di)
+{
+ cancel_delayed_work_sync(&di->work);
+
+ power_supply_unregister(&di->bat);
+}
+
/* i2c specific code */
#ifdef CONFIG_BATTERY_BQ27X00_I2C
@@ -455,7 +493,7 @@ static int bq27x00_battery_remove(struct i2c_client *client)
{
struct bq27x00_device_info *di = i2c_get_clientdata(client);
- power_supply_unregister(&di->bat);
+ bq27x00_powersupply_unregister(di);
kfree(di->bat.name);
@@ -588,7 +626,8 @@ static int __devexit bq27000_battery_remove(struct platform_device *pdev)
{
struct bq27x00_device_info *di = platform_get_drvdata(pdev);
- power_supply_unregister(&di->bat);
+ bq27x00_powersupply_unregister(di);
+
platform_set_drvdata(pdev, NULL);
kfree(di);
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists