diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2011-08-23 23:04:43 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-24 16:40:59 -0700 |
| commit | 583591884ce00d76edd735e13d47f90c0dff136f (patch) | |
| tree | 6f6077193ccff30de260b52ee11ebe5eb677bab9 /drivers | |
| parent | 4cf225b923f372a11390fcef4305a60bb5d15511 (diff) | |
power: bq27x00: add lock for battery_status_changed flag
-Add lock for battery_status_changed flag.
-Correct more appropriate fast poll period and max count.
Bug 866179
Change-Id: I3de42115043fc7434820a3850d013af665a9822c
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/48740
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index fc21818f3b89..ff457a32c9fa 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -63,8 +63,8 @@ /* Define battery poll period to 30ms */ #define BATTERY_POLL_PERIOD 30000 -#define BATTERY_FAST_POLL_PERIOD 100 -#define BATTERY_FAST_POLL_MAX_COUNT 200 +#define BATTERY_FAST_POLL_PERIOD 200 +#define BATTERY_FAST_POLL_MAX_COUNT 50 /* If the system has several batteries we need a different name for each * of them... @@ -88,6 +88,7 @@ struct bq27x00_device_info { bool battery_present; struct i2c_client *client; struct bq27x00_platform_data *plat_data; + spinlock_t lock; bool battery_status_changed; enum bq27x00_status battery_status; int fast_poll_count; @@ -246,6 +247,8 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di, return ret; } + spin_lock_irq(&di->lock); + if ((di->chip == BQ27500) || (di->chip == BQ27510)) { if (ret & BQ27500_FLAG_DSC) { status = POWER_SUPPLY_STATUS_DISCHARGING; @@ -269,6 +272,8 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di, status = POWER_SUPPLY_STATUS_DISCHARGING; } + spin_unlock_irq(&di->lock); + val->intval = status; return 0; } @@ -516,11 +521,18 @@ static void bq27x00_powersupply_init(struct bq27x00_device_info *di) static irqreturn_t ac_present_irq(int irq, void *data) { struct bq27x00_device_info *di = data; + unsigned long flags; + + spin_lock_irqsave(&di->lock, flags); + power_supply_changed(&di->ac); di->battery_status_changed = true; di->fast_poll_count = 0; mod_timer(&di->battery_poll_timer, jiffies + msecs_to_jiffies(BATTERY_FAST_POLL_PERIOD)); + + spin_unlock_irqrestore(&di->lock, flags); + return IRQ_HANDLED; } @@ -528,6 +540,9 @@ static void battery_poll_timer_func(unsigned long pdi) { struct bq27x00_device_info *di = (void *)pdi; power_supply_changed(&di->bat); + + spin_lock_irq(&di->lock); + if (di->battery_status_changed) { if (di->fast_poll_count < BATTERY_FAST_POLL_MAX_COUNT) { mod_timer(&di->battery_poll_timer, @@ -544,6 +559,8 @@ static void battery_poll_timer_func(unsigned long pdi) mod_timer(&di->battery_poll_timer, jiffies + msecs_to_jiffies(BATTERY_POLL_PERIOD)); } + + spin_unlock_irq(&di->lock); } static int bq27x00_battery_probe(struct i2c_client *client, @@ -576,6 +593,8 @@ static int bq27x00_battery_probe(struct i2c_client *client, di->battery_status_changed = false; di->battery_status = DISCHARGING; + spin_lock_init(&di->lock); + di->irq = client->irq; if (client->dev.platform_data) { di->plat_data = kzalloc(sizeof(struct bq27x00_platform_data), |