TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: supply: core: constify power_supply_battery_info::ocv_table

Browse Source 
The power supply core never modifies the ocv table.
Reflect this in the API, so drivers can mark their static tables as
const.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20241005-power-supply-battery-const-v1-5-c1f721927048@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Thomas Weißschuh
2024-10-05 12:04:21 +02:00
committed by Sebastian Reichel
parent 840683c341
commit ce20d5b9e3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/power/supply/power_supply_core.c
+4 -4
View File
@@ -777,7 +777,7 @@ int power_supply_get_battery_info(struct power_supply *psy,
tab_len = size / (2 * sizeof(__be32)); tab_len = size / (2 * sizeof(__be32));
info->ocv_table_size[index] = tab_len; info->ocv_table_size[index] = tab_len;
table = info->ocv_table[index] = info->ocv_table[index] = table =
devm_kcalloc(&psy->dev, tab_len, sizeof(*table), GFP_KERNEL); devm_kcalloc(&psy->dev, tab_len, sizeof(*table), GFP_KERNEL);
if (!info->ocv_table[index]) { if (!info->ocv_table[index]) {
power_supply_put_battery_info(psy, info); power_supply_put_battery_info(psy, info);
@@ -1093,7 +1093,7 @@ EXPORT_SYMBOL_GPL(power_supply_get_maintenance_charging_setting);
* *
* Return: the battery capacity. * Return: the battery capacity.
*/ */
int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table, int power_supply_ocv2cap_simple(const struct power_supply_battery_ocv_table *table,
int table_len, int ocv) int table_len, int ocv)
{ {
int i, high, low; int i, high, low;
@@ -1118,7 +1118,7 @@ int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table,
} }
EXPORT_SYMBOL_GPL(power_supply_ocv2cap_simple); EXPORT_SYMBOL_GPL(power_supply_ocv2cap_simple);
struct power_supply_battery_ocv_table * const struct power_supply_battery_ocv_table *
power_supply_find_ocv2cap_table(struct power_supply_battery_info *info, power_supply_find_ocv2cap_table(struct power_supply_battery_info *info,
int temp, int *table_len) int temp, int *table_len)
{ {
@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL_GPL(power_supply_find_ocv2cap_table);
int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info, int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info,
int ocv, int temp) int ocv, int temp)
{ {
struct power_supply_battery_ocv_table *table; const struct power_supply_battery_ocv_table *table;
int table_len; int table_len;
table = power_supply_find_ocv2cap_table(info, temp, &table_len); table = power_supply_find_ocv2cap_table(info, temp, &table_len);
include/linux/power_supply.h
+3 -3
View File
@@ -750,7 +750,7 @@ struct power_supply_battery_info {
int temp_alert_max; int temp_alert_max;
int temp_min; int temp_min;
int temp_max; int temp_max;
struct power_supply_battery_ocv_table *ocv_table[POWER_SUPPLY_OCV_TEMP_MAX]; const struct power_supply_battery_ocv_table *ocv_table[POWER_SUPPLY_OCV_TEMP_MAX];
int ocv_table_size[POWER_SUPPLY_OCV_TEMP_MAX]; int ocv_table_size[POWER_SUPPLY_OCV_TEMP_MAX];
const struct power_supply_resistance_temp_table *resist_table; const struct power_supply_resistance_temp_table *resist_table;
int resist_table_size; int resist_table_size;
@@ -797,9 +797,9 @@ extern bool power_supply_battery_info_has_prop(struct power_supply_battery_info
extern int power_supply_battery_info_get_prop(struct power_supply_battery_info *info, extern int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,
enum power_supply_property psp, enum power_supply_property psp,
union power_supply_propval *val); union power_supply_propval *val);
extern int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table, extern int power_supply_ocv2cap_simple(const struct power_supply_battery_ocv_table *table,
int table_len, int ocv); int table_len, int ocv);
extern struct power_supply_battery_ocv_table * extern const struct power_supply_battery_ocv_table *
power_supply_find_ocv2cap_table(struct power_supply_battery_info *info, power_supply_find_ocv2cap_table(struct power_supply_battery_info *info,
int temp, int *table_len); int temp, int *table_len);
extern int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info, extern int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info,