| Message ID | 20221010141329.10006-1-macroalpha82@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | power: supply: Change rk817_chg_cur_to_reg to int | expand |
Hi, On Mon, Oct 10, 2022 at 09:13:29AM -0500, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > Change return value of rk817_chg_cur_to_reg from u8 to int. If the > function fails to find a suitable value it returns a -EINVAL, but > defined as a u8 it would not return correctly. Additionally, change > defined variable that stores return value from u8 to int. > > Fixes: 11cb8da0189b (power: supply: Add charger driver for Rockchip > RK817) Wrong format, must be one line and title should be in quotes in addition to the brackets. (I fixed this while applying) > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > --- Thanks, queued to fixes branch. -- Sebastian > drivers/power/supply/rk817_charger.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c > index 635f051b0821..305354d99177 100644 > --- a/drivers/power/supply/rk817_charger.c > +++ b/drivers/power/supply/rk817_charger.c > @@ -121,7 +121,7 @@ struct rk817_charger { > #define ADC_TO_CHARGE_UAH(adc_value, res_div) \ > (adc_value / 3600 * 172 / res_div) > > -static u8 rk817_chg_cur_to_reg(u32 chg_cur_ma) > +static int rk817_chg_cur_to_reg(u32 chg_cur_ma) > { > if (chg_cur_ma >= 3500) > return CHG_3_5A; > @@ -864,8 +864,8 @@ static int rk817_battery_init(struct rk817_charger *charger, > { > struct rk808 *rk808 = charger->rk808; > u32 tmp, max_chg_vol_mv, max_chg_cur_ma; > - u8 max_chg_vol_reg, chg_term_i_reg, max_chg_cur_reg; > - int ret, chg_term_ma; > + u8 max_chg_vol_reg, chg_term_i_reg; > + int ret, chg_term_ma, max_chg_cur_reg; > u8 bulk_reg[2]; > > /* Get initial plug state */ > -- > 2.25.1 >
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c index 635f051b0821..305354d99177 100644 --- a/drivers/power/supply/rk817_charger.c +++ b/drivers/power/supply/rk817_charger.c @@ -121,7 +121,7 @@ struct rk817_charger { #define ADC_TO_CHARGE_UAH(adc_value, res_div) \ (adc_value / 3600 * 172 / res_div) -static u8 rk817_chg_cur_to_reg(u32 chg_cur_ma) +static int rk817_chg_cur_to_reg(u32 chg_cur_ma) { if (chg_cur_ma >= 3500) return CHG_3_5A; @@ -864,8 +864,8 @@ static int rk817_battery_init(struct rk817_charger *charger, { struct rk808 *rk808 = charger->rk808; u32 tmp, max_chg_vol_mv, max_chg_cur_ma; - u8 max_chg_vol_reg, chg_term_i_reg, max_chg_cur_reg; - int ret, chg_term_ma; + u8 max_chg_vol_reg, chg_term_i_reg; + int ret, chg_term_ma, max_chg_cur_reg; u8 bulk_reg[2]; /* Get initial plug state */