Hi, On Tue, Mar 10, 2026 at 01:28:31PM +0400, Alexey Charkov wrote: > Move the remaining get/set helper functions to indirect calls via the > per-chip bq257xx_chip_info struct. > > This improves the consistency of the code and prepares the driver to > support multiple chip variants with different register layouts and bit > definitions. > > Tested-by: Chris Morgan > Signed-off-by: Alexey Charkov > --- Reviewed-by: Sebastian Reichel -- Sebastian > drivers/power/supply/bq257xx_charger.c | 24 ++++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) > > diff --git a/drivers/power/supply/bq257xx_charger.c b/drivers/power/supply/bq257xx_charger.c > index e14dd16f9d08..deb60a9bd222 100644 > --- a/drivers/power/supply/bq257xx_charger.c > +++ b/drivers/power/supply/bq257xx_charger.c > @@ -30,9 +30,15 @@ struct bq257xx_chip_info { > int (*bq257xx_hw_init)(struct bq257xx_chg *pdata); > void (*bq257xx_hw_shutdown)(struct bq257xx_chg *pdata); > int (*bq257xx_get_state)(struct bq257xx_chg *pdata); > + int (*bq257xx_get_ichg)(struct bq257xx_chg *pdata, int *intval); > int (*bq257xx_set_ichg)(struct bq257xx_chg *pdata, int ichg); > + int (*bq257xx_get_vbatreg)(struct bq257xx_chg *pdata, int *intval); > int (*bq257xx_set_vbatreg)(struct bq257xx_chg *pdata, int vbatreg); > + int (*bq257xx_get_iindpm)(struct bq257xx_chg *pdata, int *intval); > int (*bq257xx_set_iindpm)(struct bq257xx_chg *pdata, int iindpm); > + int (*bq257xx_get_cur)(struct bq257xx_chg *pdata, int *intval); > + int (*bq257xx_get_vbat)(struct bq257xx_chg *pdata, int *intval); > + int (*bq257xx_get_min_vsys)(struct bq257xx_chg *pdata, int *intval); > }; > > /** > @@ -489,22 +495,22 @@ static int bq257xx_get_charger_property(struct power_supply *psy, > break; > > case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: > - return bq25703_get_iindpm(pdata, &val->intval); > + return pdata->chip->bq257xx_get_iindpm(pdata, &val->intval); > > case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: > - return bq25703_get_chrg_volt(pdata, &val->intval); > + return pdata->chip->bq257xx_get_vbatreg(pdata, &val->intval); > > case POWER_SUPPLY_PROP_CURRENT_NOW: > - return bq25703_get_cur(pdata, &val->intval); > + return pdata->chip->bq257xx_get_cur(pdata, &val->intval); > > case POWER_SUPPLY_PROP_VOLTAGE_NOW: > - return bq25703_get_vbat(pdata, &val->intval); > + return pdata->chip->bq257xx_get_vbat(pdata, &val->intval); > > case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: > - return bq25703_get_ichg_cur(pdata, &val->intval); > + return pdata->chip->bq257xx_get_ichg(pdata, &val->intval); > > case POWER_SUPPLY_PROP_VOLTAGE_MIN: > - return bq25703_get_min_vsys(pdata, &val->intval); > + return pdata->chip->bq257xx_get_min_vsys(pdata, &val->intval); > > case POWER_SUPPLY_PROP_USB_TYPE: > val->intval = pdata->usb_type; > @@ -632,9 +638,15 @@ static const struct bq257xx_chip_info bq25703_chip_info = { > .bq257xx_hw_init = &bq25703_hw_init, > .bq257xx_hw_shutdown = &bq25703_hw_shutdown, > .bq257xx_get_state = &bq25703_get_state, > + .bq257xx_get_ichg = &bq25703_get_ichg_cur, > .bq257xx_set_ichg = &bq25703_set_ichg_cur, > + .bq257xx_get_vbatreg = &bq25703_get_chrg_volt, > .bq257xx_set_vbatreg = &bq25703_set_chrg_volt, > + .bq257xx_get_iindpm = &bq25703_get_iindpm, > .bq257xx_set_iindpm = &bq25703_set_iindpm, > + .bq257xx_get_cur = &bq25703_get_cur, > + .bq257xx_get_vbat = &bq25703_get_vbat, > + .bq257xx_get_min_vsys = &bq25703_get_min_vsys, > }; > > /** > > -- > 2.52.0 >