@@ -611,6 +611,61 @@ static const struct dmi_system_id axp288_no_battery_list[] = {
{}
};
+static int axp288_fuel_gauge_read_initial_regs(struct axp288_fg_info *info)
+{
+ unsigned int val;
+ int ret;
+
+ /*
+ * On some devices the fuelgauge and charger parts of the axp288 are
+ * not used, check that the fuelgauge is enabled (CC_CTRL != 0).
+ */
+ ret = regmap_read(info->regmap, AXP20X_CC_CTRL, &val);
+ if (ret < 0)
+ return ret;
+ if (val == 0)
+ return -ENODEV;
+
+ ret = fuel_gauge_reg_readb(info, AXP288_FG_DES_CAP1_REG);
+ if (ret < 0)
+ return ret;
+
+ if (!(ret & FG_DES_CAP1_VALID)) {
+ dev_err(info->dev, "axp288 not configured by firmware\n");
+ return -ENODEV;
+ }
+
+ ret = fuel_gauge_reg_readb(info, AXP20X_CHRG_CTRL1);
+ if (ret < 0)
+ return ret;
+ switch ((ret & CHRG_CCCV_CV_MASK) >> CHRG_CCCV_CV_BIT_POS) {
+ case CHRG_CCCV_CV_4100MV:
+ info->max_volt = 4100;
+ break;
+ case CHRG_CCCV_CV_4150MV:
+ info->max_volt = 4150;
+ break;
+ case CHRG_CCCV_CV_4200MV:
+ info->max_volt = 4200;
+ break;
+ case CHRG_CCCV_CV_4350MV:
+ info->max_volt = 4350;
+ break;
+ }
+
+ ret = fuel_gauge_reg_readb(info, AXP20X_PWR_OP_MODE);
+ if (ret < 0)
+ return ret;
+ info->pwr_op = ret;
+
+ ret = fuel_gauge_reg_readb(info, AXP288_FG_LOW_CAP_REG);
+ if (ret < 0)
+ return ret;
+ info->low_cap = ret;
+
+ return 0;
+}
+
static int axp288_fuel_gauge_probe(struct platform_device *pdev)
{
int i, ret = 0;
@@ -623,7 +678,6 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev)
[BAT_VOLT] = "axp288-batt-volt",
};
struct device *dev = &pdev->dev;
- unsigned int val;
if (dmi_check_system(axp288_no_battery_list))
return -ENODEV;
@@ -665,59 +719,8 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev)
if (ret < 0)
goto out_free_iio_chan;
- /*
- * On some devices the fuelgauge and charger parts of the axp288 are
- * not used, check that the fuelgauge is enabled (CC_CTRL != 0).
- */
- ret = regmap_read(axp20x->regmap, AXP20X_CC_CTRL, &val);
- if (ret < 0)
- goto unblock_punit_i2c_access;
- if (val == 0) {
- ret = -ENODEV;
- goto unblock_punit_i2c_access;
- }
-
- ret = fuel_gauge_reg_readb(info, AXP288_FG_DES_CAP1_REG);
- if (ret < 0)
- goto unblock_punit_i2c_access;
-
- if (!(ret & FG_DES_CAP1_VALID)) {
- dev_err(&pdev->dev, "axp288 not configured by firmware\n");
- ret = -ENODEV;
- goto unblock_punit_i2c_access;
- }
-
- ret = fuel_gauge_reg_readb(info, AXP20X_CHRG_CTRL1);
- if (ret < 0)
- goto unblock_punit_i2c_access;
- switch ((ret & CHRG_CCCV_CV_MASK) >> CHRG_CCCV_CV_BIT_POS) {
- case CHRG_CCCV_CV_4100MV:
- info->max_volt = 4100;
- break;
- case CHRG_CCCV_CV_4150MV:
- info->max_volt = 4150;
- break;
- case CHRG_CCCV_CV_4200MV:
- info->max_volt = 4200;
- break;
- case CHRG_CCCV_CV_4350MV:
- info->max_volt = 4350;
- break;
- }
-
- ret = fuel_gauge_reg_readb(info, AXP20X_PWR_OP_MODE);
- if (ret < 0)
- goto unblock_punit_i2c_access;
- info->pwr_op = ret;
-
- ret = fuel_gauge_reg_readb(info, AXP288_FG_LOW_CAP_REG);
- if (ret < 0)
- goto unblock_punit_i2c_access;
- info->low_cap = ret;
-
-unblock_punit_i2c_access:
+ ret = axp288_fuel_gauge_read_initial_regs(info);
iosf_mbi_unblock_punit_i2c_access();
- /* In case we arrive here by goto because of a register access error */
if (ret < 0)
goto out_free_iio_chan;
Refactor probe a bit, introducing a new axp288_fuel_gauge_read_initial_regs() helper. This replaces a whole bunch of gotos and removes the unblock_punit_i2c_access label. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/axp288_fuel_gauge.c | 109 ++++++++++++----------- 1 file changed, 56 insertions(+), 53 deletions(-)