power: supply: 88pm860x: Use common error handling code in set_charging_fsm()
Subsystems (2)
PATCH 1/1 power: supply: 88pm860x: Use common error handling code in set_charging_fsm()
From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 12:50:09 +0200
Add a jump target so that a bit of exception handling can be better reused at the end of this function implementation.
This issue was detected by using the Coccinelle software.
Signed-off-by Markus Elfring <[email protected]>
--- drivers/power/supply/88pm860x_charger.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/power/supply/88pm860x_charger.c +10 -8
@@ -295,17 +295,15 @@ static int set_charging_fsm(struct pm860x_charger_info *info)return -EINVAL ; ret =power_supply_get_property (psy,POWER_SUPPLY_PROP_VOLTAGE_NOW , &data); -if (ret) { -power_supply_put (psy); -return ret; - } +if (ret) + goto put_supply; + vbatt = data.intval /1000 ; ret =power_supply_get_property (psy,POWER_SUPPLY_PROP_PRESENT , &data); -if (ret) { -power_supply_put (psy); -return ret; - } +if (ret) + goto put_supply; +power_supply_put (psy);mutex_lock (&info->lock);
@@ -391,6 +389,10 @@ static int set_charging_fsm(struct pm860x_charger_info *info)mutex_unlock (&info->lock);return 0 ; + +put_supply: +power_supply_put (psy); +return ret; }static irqreturn_t pm860x_charger_handler (int irq,void *data)
--
2.46.1