From 45413165bef33bb7d5544a3331f39492cdde9418 Mon Sep 17 00:00:00 2001 From: Waqar Hameed Date: Mon, 29 Jun 2026 17:44:57 +0200 Subject: [PATCH] power: supply: rt9471: Remove superfluous unpacking of propval Remove extra variable in `set/get_property`-functions that is only supplied directly to other functions. The value is not used for anything else. Moreover, wrap these lines. Otherwise `checkpatch` warns about too long lines. Signed-off-by: Waqar Hameed Link: https://patch.msgid.link/6b4367512dfad62e865de8b6be52eefd5385fa26.1782746851.git.waqar.hameed@axis.com Signed-off-by: Sebastian Reichel --- drivers/power/supply/rt9471.c | 49 +++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/power/supply/rt9471.c b/drivers/power/supply/rt9471.c index e1cfe484ea91..1a004ba91985 100644 --- a/drivers/power/supply/rt9471.c +++ b/drivers/power/supply/rt9471.c @@ -370,23 +370,28 @@ static int rt9471_charger_set_property(struct power_supply *psy, const union power_supply_propval *val) { struct rt9471_chip *chip = power_supply_get_drvdata(psy); - int value = val->intval; switch (psp) { case POWER_SUPPLY_PROP_STATUS: - return regmap_field_write(chip->rm_fields[F_CHG_EN], !!value); + return regmap_field_write(chip->rm_fields[F_CHG_EN], + !!val->intval); case POWER_SUPPLY_PROP_ONLINE: - return regmap_field_write(chip->rm_fields[F_HZ], !value); + return regmap_field_write(chip->rm_fields[F_HZ], !val->intval); case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: - return rt9471_set_value_by_field_range(chip, F_ICHG_REG, RT9471_RANGE_ICHG, value); + return rt9471_set_value_by_field_range( + chip, F_ICHG_REG, RT9471_RANGE_ICHG, val->intval); case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: - return rt9471_set_value_by_field_range(chip, F_VBAT_REG, RT9471_RANGE_VCHG, value); + return rt9471_set_value_by_field_range( + chip, F_VBAT_REG, RT9471_RANGE_VCHG, val->intval); case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: - return rt9471_set_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, value); + return rt9471_set_value_by_field_range( + chip, F_AICR, RT9471_RANGE_AICR, val->intval); case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: - return rt9471_set_value_by_field_range(chip, F_MIVR, RT9471_RANGE_MIVR, value); + return rt9471_set_value_by_field_range( + chip, F_MIVR, RT9471_RANGE_MIVR, val->intval); case POWER_SUPPLY_PROP_PRECHARGE_CURRENT: - return rt9471_set_value_by_field_range(chip, F_IPRE_CHG, RT9471_RANGE_IPRE, value); + return rt9471_set_value_by_field_range( + chip, F_IPRE_CHG, RT9471_RANGE_IPRE, val->intval); case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT: return rt9471_set_ieoc(chip, val->intval); default: @@ -402,35 +407,39 @@ static int rt9471_charger_get_property(struct power_supply *psy, union power_supply_propval *val) { struct rt9471_chip *chip = power_supply_get_drvdata(psy); - int *pvalue = &val->intval; switch (psp) { case POWER_SUPPLY_PROP_STATUS: - return rt9471_get_status(chip, pvalue); + return rt9471_get_status(chip, &val->intval); case POWER_SUPPLY_PROP_ONLINE: - return rt9471_get_vbus_good(chip, pvalue); + return rt9471_get_vbus_good(chip, &val->intval); case POWER_SUPPLY_PROP_CURRENT_MAX: - return rt9471_get_usb_type_current(chip, pvalue); + return rt9471_get_usb_type_current(chip, &val->intval); case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: - return rt9471_get_value_by_field_range(chip, F_ICHG_REG, RT9471_RANGE_ICHG, pvalue); + return rt9471_get_value_by_field_range( + chip, F_ICHG_REG, RT9471_RANGE_ICHG, &val->intval); case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: - *pvalue = RT9471_ICHG_MAXUA; + val->intval = RT9471_ICHG_MAXUA; return 0; case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: - return rt9471_get_value_by_field_range(chip, F_VBAT_REG, RT9471_RANGE_VCHG, pvalue); + return rt9471_get_value_by_field_range( + chip, F_VBAT_REG, RT9471_RANGE_VCHG, &val->intval); case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: val->intval = RT9471_VCHG_MAXUV; return 0; case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT: - return rt9471_get_value_by_field_range(chip, F_AICR, RT9471_RANGE_AICR, pvalue); + return rt9471_get_value_by_field_range( + chip, F_AICR, RT9471_RANGE_AICR, &val->intval); case POWER_SUPPLY_PROP_INPUT_VOLTAGE_LIMIT: - return rt9471_get_value_by_field_range(chip, F_MIVR, RT9471_RANGE_MIVR, pvalue); + return rt9471_get_value_by_field_range( + chip, F_MIVR, RT9471_RANGE_MIVR, &val->intval); case POWER_SUPPLY_PROP_USB_TYPE: - return rt9471_get_usb_type(chip, pvalue); + return rt9471_get_usb_type(chip, &val->intval); case POWER_SUPPLY_PROP_PRECHARGE_CURRENT: - return rt9471_get_value_by_field_range(chip, F_IPRE_CHG, RT9471_RANGE_IPRE, pvalue); + return rt9471_get_value_by_field_range( + chip, F_IPRE_CHG, RT9471_RANGE_IPRE, &val->intval); case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT: - return rt9471_get_ieoc(chip, pvalue); + return rt9471_get_ieoc(chip, &val->intval); case POWER_SUPPLY_PROP_MODEL_NAME: val->strval = rt9471_model; return 0;