Commit 964b3e9b authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: axp288_fuel_gauge: Move the AXP20X_CC_CTRL check together with the other checks 



The I2C-bus to the XPower AXP288 is shared between the Linux kernel and
the SoCs P-Unit. The P-Unit has a semaphore which the kernel must "lock"
before it may use the bus. If not explicitly taken by the I2C-driver,
then this semaphore is automatically taken by the I2C-bus-driver for
each I2C-transfer.

Move the AXP20X_CC_CTRL check done in probe() together with the other
register-accesses done in probe, so that we can take the semaphore once
for the entire set of register-accesses.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 394088f0

drivers/power/supply/axp288_fuel_gauge.c

+12 −10
Original line number Diff line number Diff line
@@ -627,16 +627,6 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev) 
	if (dmi_check_system(axp288_no_battery_list))

		return -ENODEV;



	/*

	 * 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)

		return ret;

	if (val == 0)

		return -ENODEV;



	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -671,6 +661,18 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev) 
		}

	}



	/*

	 * 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 out_free_iio_chan;

	if (val == 0) {

		ret = -ENODEV;

		goto out_free_iio_chan;

	}



	ret = fuel_gauge_reg_readb(info, AXP288_FG_DES_CAP1_REG);

	if (ret < 0)

		goto out_free_iio_chan;