Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d143d4 authored by Peter Rosin's avatar Peter Rosin Committed by Sebastian Reichel
Browse files

power: supply: bq24735: always check for AC adapter presence in probe 



So what if there is a status_gpio specified? bq24735_charger_is_present()
do have a working fallback for the case of no status_gpio.

Simplify this by not special casing setups w/o status_gpio, folding
two consecutive if-blocks in the process.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent a07bea32

drivers/power/supply/bq24735-charger.c

+1 −4
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int bq24735_charger_probe(struct i2c_client *client, 
		return ret;

	}



	if (!charger->status_gpio || bq24735_charger_is_present(charger)) {

	if (bq24735_charger_is_present(charger)) {

		ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID);

		if (ret < 0) {

			dev_err(&client->dev, "Failed to read manufacturer id : %d\n",
@@ -437,10 +437,7 @@ static int bq24735_charger_probe(struct i2c_client *client, 
				"device id mismatch. 0x000b != 0x%04x\n", ret);

			return -ENODEV;

		}

	}



	/* check for AC adapter presence */

	if (bq24735_charger_is_present(charger)) {

		ret = bq24735_enable_charging(charger);

		if (ret < 0) {

			dev_err(&client->dev, "Failed to enable charging\n");