diff options
Diffstat (limited to 'drivers/power/supply/bq24190_charger.c')
| -rw-r--r-- | drivers/power/supply/bq24190_charger.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 8e28f86ae09f..4bea6fd83c36 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -242,7 +242,6 @@ struct bq24190_dev_info { struct mutex f_reg_lock; u8 f_reg; u8 ss_reg; - u8 watchdog; const struct bq24190_chip_info *info; }; @@ -751,13 +750,6 @@ static int bq24190_set_config(struct bq24190_dev_info *bdi) int ret; u8 v; - ret = bq24190_read(bdi, BQ24190_REG_CTTC, &v); - if (ret < 0) - return ret; - - bdi->watchdog = ((v & BQ24190_REG_CTTC_WATCHDOG_MASK) >> - BQ24190_REG_CTTC_WATCHDOG_SHIFT); - /* * According to the "Host Mode and default Mode" section of the * manual, a write to any register causes the bq24190 to switch @@ -766,9 +758,9 @@ static int bq24190_set_config(struct bq24190_dev_info *bdi) * So, by simply turning off the WDT, we accomplish both with the * same write. */ - v &= ~BQ24190_REG_CTTC_WATCHDOG_MASK; - - ret = bq24190_write(bdi, BQ24190_REG_CTTC, v); + ret = bq24190_write_mask(bdi, BQ24190_REG_CTTC, + BQ24190_REG_CTTC_WATCHDOG_MASK, + BQ24190_REG_CTTC_WATCHDOG_SHIFT, 0); if (ret < 0) return ret; @@ -2169,10 +2161,8 @@ static int bq24190_probe(struct i2c_client *client) bq24190_irq_handler_thread, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "bq24190-charger", bdi); - if (ret < 0) { - dev_err(dev, "Can't set up irq handler\n"); + if (ret < 0) goto out_charger; - } ret = bq24190_register_vbus_regulator(bdi); if (ret < 0) |