diff options
| author | Peter Rosin <peda@axentia.se> | 2016-12-20 12:33:02 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-01-04 22:00:52 +0100 |
| commit | a7d143d42b3d88862e49a67716187c556fb4624b (patch) | |
| tree | cb599c746ceee8eb7247b5ef6c4de27a4ea79eba /drivers/power | |
| parent | a07bea32c612bf32b7f36c0eb0b1e2f5c444183e (diff) | |
| download | linux-stable-a7d143d42b3d88862e49a67716187c556fb4624b.tar.gz linux-stable-a7d143d42b3d88862e49a67716187c556fb4624b.tar.bz2 linux-stable-a7d143d42b3d88862e49a67716187c556fb4624b.zip | |
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: Peter Rosin <peda@axentia.se>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/bq24735-charger.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c index 71f977d055d7..4f6275e5cf1c 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -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"); |