diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2021-11-20 18:53:17 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-11-22 19:16:25 +0300 |
| commit | 2d3559a50ad6d21552ed2434889bc568acfa2a83 (patch) | |
| tree | 9760ebd524b1ecee38168eaf55942cd857758ac7 /drivers/power | |
| parent | 22be8d77c80dca59af004d4595699b2092670499 (diff) | |
| download | linux-2d3559a50ad6d21552ed2434889bc568acfa2a83.tar.xz | |
power: supply: ab8500: Standardize technology
The AB8500 custom battery type can be replaced by the
corresponding struct power_supply_battery_info field.
Remove the struct member and amend the code to use the
standard property.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/ab8500-bm.h | 2 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_bmdata.c | 1 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_btemp.c | 6 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_fg.c | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/power/supply/ab8500-bm.h b/drivers/power/supply/ab8500-bm.h index a5cae9288274..750d1a962f39 100644 --- a/drivers/power/supply/ab8500-bm.h +++ b/drivers/power/supply/ab8500-bm.h @@ -372,7 +372,6 @@ struct ab8500_maxim_parameters { /** * struct ab8500_battery_type - different batteries supported - * @name: battery technology * @resis_high: battery upper resistance limit * @resis_low: battery lower resistance limit * @nominal_voltage: Nominal voltage of the battery in mV @@ -400,7 +399,6 @@ struct ab8500_maxim_parameters { * @batres_tbl battery internal resistance vs temperature table */ struct ab8500_battery_type { - int name; int resis_high; int resis_low; int nominal_voltage; diff --git a/drivers/power/supply/ab8500_bmdata.c b/drivers/power/supply/ab8500_bmdata.c index 2d328d3007a9..44d7c568949f 100644 --- a/drivers/power/supply/ab8500_bmdata.c +++ b/drivers/power/supply/ab8500_bmdata.c @@ -81,7 +81,6 @@ static const struct batres_vs_temp temp_to_batres_tbl_thermistor[] = { /* Default battery type for reference designs is the unknown type */ static struct ab8500_battery_type bat_type_thermistor_unknown = { - .name = POWER_SUPPLY_TECHNOLOGY_UNKNOWN, .resis_high = 0, .resis_low = 0, .battery_resistance = 300, diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c index fbb58074efab..20253b8a7fe9 100644 --- a/drivers/power/supply/ab8500_btemp.c +++ b/drivers/power/supply/ab8500_btemp.c @@ -456,7 +456,7 @@ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) int rbat, rntc, vntc; if ((di->bm->adc_therm == AB8500_ADC_THERM_BATCTRL) && - (di->bm->bat_type->name == POWER_SUPPLY_TECHNOLOGY_UNKNOWN)) { + (di->bm->bi.technology == POWER_SUPPLY_TECHNOLOGY_UNKNOWN)) { rbat = ab8500_btemp_get_batctrl_res(di); if (rbat < 0) { @@ -540,7 +540,7 @@ static int ab8500_btemp_id(struct ab8500_btemp *di) * that need it. */ if ((di->bm->adc_therm == AB8500_ADC_THERM_BATCTRL) && - (di->bm->bat_type->name == POWER_SUPPLY_TECHNOLOGY_LIPO) && + (di->bm->bi.technology == POWER_SUPPLY_TECHNOLOGY_LIPO) && (res <= 53407) && (res >= 12500)) { dev_dbg(di->dev, "Set BATCTRL current source to 20uA\n"); di->curr_source = BTEMP_BATCTRL_CURR_SRC_20UA; @@ -807,7 +807,7 @@ static int ab8500_btemp_get_property(struct power_supply *psy, val->intval = 1; break; case POWER_SUPPLY_PROP_TECHNOLOGY: - val->intval = di->bm->bat_type->name; + val->intval = di->bm->bi.technology; break; case POWER_SUPPLY_PROP_TEMP: val->intval = ab8500_btemp_get_temp(di); diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c index 4f8b3a76c565..c6237c4f4721 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2233,7 +2233,7 @@ static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data) switch (ext->desc->type) { case POWER_SUPPLY_TYPE_BATTERY: if (!di->flags.batt_id_received && - (di->bm->bat_type->name != + (di->bm->bi.technology != POWER_SUPPLY_TECHNOLOGY_UNKNOWN)) { const struct ab8500_battery_type *b; |