diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2017-12-26 13:59:01 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2018-01-08 18:38:57 +0100 |
| commit | 672b4b00603ec8e4e4fbfabbb2fd353c5f8523c4 (patch) | |
| tree | 067291b6375e91d8c5b15f1d47eafb5aab167ca5 /drivers/power/supply/axp288_charger.c | |
| parent | a59943f8f6a74460254515b359dfd045615adc9a (diff) | |
| download | lwn-672b4b00603ec8e4e4fbfabbb2fd353c5f8523c4.tar.gz lwn-672b4b00603ec8e4e4fbfabbb2fd353c5f8523c4.zip | |
power: supply: axp288_charger: Remove charger-enabled state tracking
The extcon code is the only one to trigger our worker (outside of the
initial run) and we can rely on it to only call us if things have
changed, so there is no need to track the charger-enabled state.
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply/axp288_charger.c')
| -rw-r--r-- | drivers/power/supply/axp288_charger.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c index d398f8ee296d..5d8308c8835d 100644 --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -162,7 +162,6 @@ struct axp288_chrg_info { int cv; int max_cc; int max_cv; - int is_charger_enabled; }; static inline int axp288_charger_set_cc(struct axp288_chrg_info *info, int cc) @@ -291,9 +290,6 @@ static int axp288_charger_enable_charger(struct axp288_chrg_info *info, { int ret; - if ((int)enable == info->is_charger_enabled) - return 0; - if (enable) ret = regmap_update_bits(info->regmap, AXP20X_CHRG_CTRL1, CHRG_CCCV_CHG_EN, CHRG_CCCV_CHG_EN); @@ -302,8 +298,6 @@ static int axp288_charger_enable_charger(struct axp288_chrg_info *info, CHRG_CCCV_CHG_EN, 0); if (ret < 0) dev_err(&info->pdev->dev, "axp288 enable charger %d\n", ret); - else - info->is_charger_enabled = enable; return ret; } @@ -779,7 +773,6 @@ static int axp288_charger_probe(struct platform_device *pdev) info->pdev = pdev; info->regmap = axp20x->regmap; info->regmap_irqc = axp20x->regmap_irqc; - info->is_charger_enabled = -1; info->cable.edev = extcon_get_extcon_dev(AXP288_EXTCON_DEV_NAME); if (info->cable.edev == NULL) { |