diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2012-07-27 14:01:37 +0900 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-08-22 20:09:08 -0700 |
| commit | fd65ee5f1c21af9ff9f113842d513ca50749ad68 (patch) | |
| tree | 70a530582f4ccc7c477c2d3463794d480087c502 | |
| parent | dbb61fc7452632a4225b2fe3719b6c2d1306e257 (diff) | |
| download | linux-fd65ee5f1c21af9ff9f113842d513ca50749ad68.tar.bz2 | |
charger-manager: Use replacement variable to check state of battery
This patch remove unnecessary variable(cm->fullbatt_vchk_uV) by using
'desc->fullbatt_uV' field directly in fullbatt_handler() function
to check the state of battery.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
| -rw-r--r-- | drivers/power/charger-manager.c | 2 | ||||
| -rw-r--r-- | include/linux/power/charger-manager.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 240de49934f1..cdf29d2eb7a5 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -415,7 +415,7 @@ static void fullbatt_vchk(struct work_struct *work) return; } - diff = cm->fullbatt_vchk_uV; + diff = desc->fullbatt_uV; diff -= batt_uV; dev_dbg(cm->dev, "VBATT dropped %duV after full-batt.\n", diff); diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index cd22029e32aa..7d7b90fb7b4b 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h @@ -194,8 +194,6 @@ struct charger_desc { * @charger_enabled: the state of charger * @fullbatt_vchk_jiffies_at: * jiffies at the time full battery check will occur. - * @fullbatt_vchk_uV: voltage in microvolt - * criteria for full battery * @fullbatt_vchk_work: work queue for full battery check * @emergency_stop: * When setting true, stop charging @@ -218,7 +216,6 @@ struct charger_manager { bool charger_enabled; unsigned long fullbatt_vchk_jiffies_at; - unsigned int fullbatt_vchk_uV; struct delayed_work fullbatt_vchk_work; int emergency_stop; |