]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: supply: axp288_charger: Remove charger-enabled state tracking
authorHans de Goede <hdegoede@redhat.com>
Tue, 26 Dec 2017 12:59:01 +0000 (13:59 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Mon, 8 Jan 2018 17:38:57 +0000 (18:38 +0100)
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>
drivers/power/supply/axp288_charger.c

index d398f8ee296d5db98b5b3bf28313d31aba78cc02..5d8308c8835d4897947c4154f0d714da91d1d846 100644 (file)
@@ -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) {