shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

power: supply: sgm41542: fix build error for kernel 6.1

Browse Source 
drivers/power/supply/sgm41542_charger.c:930:52:
error: incompatible pointer types passing 'struct power_supply_battery_info *' to parameter of type 'struct power_supply_battery_info **'
[-Werror,-Wincompatible-pointer-types]
	 ret = power_supply_get_battery_info(sgm->charger, &bat_info);
                                                              ^~~~~~~~~
./include/linux/power_supply.h:833:42: note: passing argument to parameter 'info_out' here
                                         struct power_supply_battery_info **info_out);
                                                                                ^

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I73e2e48d45611a3d9b11f3bae306d79aa86fc38c
This commit is contained in:
shengfei Xu
2023-06-20 06:58:41 +00:00
committed by Tao Huang
parent b40b8ac1de
commit a7c9c882b7
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/power/supply/sgm41542_charger.c
View File

@@ -924,54 +924,58 @@ static int sgm4154x_power_supply_init(struct sgm4154x_device *sgm,
static int sgm4154x_hw_init(struct sgm4154x_device *sgm)
{
struct power_supply_battery_info bat_info = { };
struct power_supply_battery_info *bat_info;
int chrg_stat, ret = 0;
ret = power_supply_get_battery_info(sgm->charger, &bat_info);
if (ret) {
/* Allocate an empty battery */
bat_info = devm_kzalloc(sgm->dev, sizeof(*bat_info), GFP_KERNEL);
if (!bat_info)
return -ENOMEM;
pr_info("sgm4154x: no battery information is supplied\n");
/*
* If no battery information is supplied, we should set
* default charge termination current to 120 mA, and default
* charge termination voltage to 4.35V.
*/
bat_info.constant_charge_current_max_ua =
bat_info->constant_charge_current_max_ua =
SGM4154x_ICHRG_I_DEF_uA;
bat_info.constant_charge_voltage_max_uv =
bat_info->constant_charge_voltage_max_uv =
SGM4154x_VREG_V_DEF_uV;
bat_info.precharge_current_ua =
bat_info->precharge_current_ua =
SGM4154x_PRECHRG_I_DEF_uA;
bat_info.charge_term_current_ua =
bat_info->charge_term_current_ua =
SGM4154x_TERMCHRG_I_DEF_uA;
sgm->init_data.max_ichg =
SGM4154x_ICHRG_I_MAX_uA;
sgm->init_data.max_vreg = SGM4154x_VREG_V_DEF_uV;
}
if (!bat_info.constant_charge_current_max_ua)
bat_info.constant_charge_current_max_ua =
if (!bat_info->constant_charge_current_max_ua)
bat_info->constant_charge_current_max_ua =
SGM4154x_ICHRG_I_MAX_uA;
if (!bat_info.constant_charge_voltage_max_uv)
bat_info.constant_charge_voltage_max_uv =
if (!bat_info->constant_charge_voltage_max_uv)
bat_info->constant_charge_voltage_max_uv =
SGM4154x_VREG_V_DEF_uV;
if (!bat_info.precharge_current_ua)
bat_info.precharge_current_ua =
if (!bat_info->precharge_current_ua)
bat_info->precharge_current_ua =
SGM4154x_PRECHRG_I_DEF_uA;
if (!bat_info.charge_term_current_ua)
bat_info.charge_term_current_ua =
if (!bat_info->charge_term_current_ua)
bat_info->charge_term_current_ua =
SGM4154x_TERMCHRG_I_DEF_uA;
if (!sgm->init_data.max_ichg)
sgm->init_data.max_ichg =
SGM4154x_ICHRG_I_MAX_uA;
if (bat_info.constant_charge_voltage_max_uv)
sgm->init_data.max_vreg = bat_info.constant_charge_voltage_max_uv;
if (bat_info->constant_charge_voltage_max_uv)
sgm->init_data.max_vreg = bat_info->constant_charge_voltage_max_uv;
ret = sgm4154x_set_watchdog_timer(sgm, 0);
if (ret)
goto err_out;
ret = sgm4154x_set_prechrg_curr(sgm, bat_info.precharge_current_ua);
ret = sgm4154x_set_prechrg_curr(sgm, bat_info->precharge_current_ua);
if (ret)
goto err_out;
@@ -981,7 +985,7 @@ static int sgm4154x_hw_init(struct sgm4154x_device *sgm)
goto err_out;
ret = sgm4154x_set_term_curr(sgm,
bat_info.charge_term_current_ua);
bat_info->charge_term_current_ua);
if (ret)
goto err_out;
@@ -1000,7 +1004,7 @@ static int sgm4154x_hw_init(struct sgm4154x_device *sgm)
if (ret)
goto err_out;
ret = sgm4154x_set_ichrg_curr(sgm,
bat_info.constant_charge_current_max_ua);
bat_info->constant_charge_current_max_ua);
if (ret)
goto err_out;
@@ -1037,10 +1041,10 @@ static int sgm4154x_hw_init(struct sgm4154x_device *sgm)
"chrg_vol:%d\n"
"term_curr:%d\n"
"input_curr_lim:%d\n",
bat_info.constant_charge_current_max_ua,
bat_info.precharge_current_ua,
bat_info.constant_charge_voltage_max_uv,
bat_info.charge_term_current_ua,
bat_info->constant_charge_current_max_ua,
bat_info->precharge_current_ua,
bat_info->constant_charge_voltage_max_uv,
bat_info->charge_term_current_ua,
sgm->init_data.ilim);
return 0;