diff options
author | Wenyou Yang <wenyou.yang@atmel.com> | 2016-08-25 03:19:51 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2016-08-31 10:46:50 -0400 |
commit | 6b021fc91038201ed44e99ae32b6a93c6e8be1f4 (patch) | |
tree | d2fa0feb5c18cde07068da5610b80a57393222bc | |
parent | 5da643b26d280e1b061e18b92bc7d5709ee8034e (diff) |
power: supply: act8945a_charger: Remove "battery_temperature"
Remove "battery_temperature" member, it is redundant, it is the
hardware's responsibility to handle TH pin properly.
It is unnecessary to use the dt property to check if there is
a battery temperature monitor or not.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | drivers/power/supply/act8945a_charger.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c index 3f486c9362c8..af006680dd5c 100644 --- a/drivers/power/supply/act8945a_charger.c +++ b/drivers/power/supply/act8945a_charger.c | |||
@@ -76,7 +76,6 @@ static const char *act8945a_charger_manufacturer = "Active-semi"; | |||
76 | 76 | ||
77 | struct act8945a_charger { | 77 | struct act8945a_charger { |
78 | struct regmap *regmap; | 78 | struct regmap *regmap; |
79 | bool battery_temperature; | ||
80 | }; | 79 | }; |
81 | 80 | ||
82 | static int act8945a_get_charger_state(struct regmap *regmap, int *val) | 81 | static int act8945a_get_charger_state(struct regmap *regmap, int *val) |
@@ -138,8 +137,7 @@ static int act8945a_get_charge_type(struct regmap *regmap, int *val) | |||
138 | return 0; | 137 | return 0; |
139 | } | 138 | } |
140 | 139 | ||
141 | static int act8945a_get_battery_health(struct act8945a_charger *charger, | 140 | static int act8945a_get_battery_health(struct regmap *regmap, int *val) |
142 | struct regmap *regmap, int *val) | ||
143 | { | 141 | { |
144 | int ret; | 142 | int ret; |
145 | unsigned int status; | 143 | unsigned int status; |
@@ -148,7 +146,7 @@ static int act8945a_get_battery_health(struct act8945a_charger *charger, | |||
148 | if (ret < 0) | 146 | if (ret < 0) |
149 | return ret; | 147 | return ret; |
150 | 148 | ||
151 | if (charger->battery_temperature && !(status & APCH_STATUS_TEMPDAT)) | 149 | if (!(status & APCH_STATUS_TEMPDAT)) |
152 | *val = POWER_SUPPLY_HEALTH_OVERHEAT; | 150 | *val = POWER_SUPPLY_HEALTH_OVERHEAT; |
153 | else if (!(status & APCH_STATUS_INDAT)) | 151 | else if (!(status & APCH_STATUS_INDAT)) |
154 | *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE; | 152 | *val = POWER_SUPPLY_HEALTH_OVERVOLTAGE; |
@@ -188,8 +186,7 @@ static int act8945a_charger_get_property(struct power_supply *psy, | |||
188 | val->intval = POWER_SUPPLY_TECHNOLOGY_LION; | 186 | val->intval = POWER_SUPPLY_TECHNOLOGY_LION; |
189 | break; | 187 | break; |
190 | case POWER_SUPPLY_PROP_HEALTH: | 188 | case POWER_SUPPLY_PROP_HEALTH: |
191 | ret = act8945a_get_battery_health(charger, | 189 | ret = act8945a_get_battery_health(regmap, &val->intval); |
192 | regmap, &val->intval); | ||
193 | break; | 190 | break; |
194 | case POWER_SUPPLY_PROP_MODEL_NAME: | 191 | case POWER_SUPPLY_PROP_MODEL_NAME: |
195 | val->strval = act8945a_charger_model; | 192 | val->strval = act8945a_charger_model; |
@@ -235,9 +232,6 @@ static int act8945a_charger_config(struct device *dev, | |||
235 | return -EINVAL; | 232 | return -EINVAL; |
236 | } | 233 | } |
237 | 234 | ||
238 | charger->battery_temperature = of_property_read_bool(np, | ||
239 | "active-semi,check-battery-temperature"); | ||
240 | |||
241 | chglev_pin = of_get_named_gpio_flags(np, | 235 | chglev_pin = of_get_named_gpio_flags(np, |
242 | "active-semi,chglev-gpios", 0, &flags); | 236 | "active-semi,chglev-gpios", 0, &flags); |
243 | 237 | ||