]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
power: supply: tps65217: Use generic name for charger online
authorMilo Kim <woogyom.kim@gmail.com>
Sun, 18 Dec 2016 02:54:28 +0000 (11:54 +0900)
committerSebastian Reichel <sre@kernel.org>
Wed, 4 Jan 2017 21:00:21 +0000 (22:00 +0100)
This driver supports AC and USB chargers. Generic name is preferred.
Replace 'ac_online' with 'online'.

Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/supply/tps65217_charger.c

index 482ee9f9edffe571ce46a33789c0619838dda39e..424a6d32bb6cda3d3447897ec2fe6be6e843f58e 100644 (file)
@@ -44,8 +44,8 @@ struct tps65217_charger {
        struct device *dev;
        struct power_supply *ac;
 
-       int     ac_online;
-       int     prev_ac_online;
+       int     online;
+       int     prev_online;
 
        struct task_struct      *poll_task;
 };
@@ -95,7 +95,7 @@ static int tps65217_enable_charging(struct tps65217_charger *charger)
        int ret;
 
        /* charger already enabled */
-       if (charger->ac_online)
+       if (charger->online)
                return 0;
 
        dev_dbg(charger->dev, "%s: enable charging\n", __func__);
@@ -110,7 +110,7 @@ static int tps65217_enable_charging(struct tps65217_charger *charger)
                return ret;
        }
 
-       charger->ac_online = 1;
+       charger->online = 1;
 
        return 0;
 }
@@ -122,7 +122,7 @@ static int tps65217_ac_get_property(struct power_supply *psy,
        struct tps65217_charger *charger = power_supply_get_drvdata(psy);
 
        if (psp == POWER_SUPPLY_PROP_ONLINE) {
-               val->intval = charger->ac_online;
+               val->intval = charger->online;
                return 0;
        }
        return -EINVAL;
@@ -133,7 +133,7 @@ static irqreturn_t tps65217_charger_irq(int irq, void *dev)
        int ret, val;
        struct tps65217_charger *charger = dev;
 
-       charger->prev_ac_online = charger->ac_online;
+       charger->prev_online = charger->online;
 
        ret = tps65217_reg_read(charger->tps, TPS65217_REG_STATUS, &val);
        if (ret < 0) {
@@ -153,10 +153,10 @@ static irqreturn_t tps65217_charger_irq(int irq, void *dev)
                        return IRQ_HANDLED;
                }
        } else {
-               charger->ac_online = 0;
+               charger->online = 0;
        }
 
-       if (charger->prev_ac_online != charger->ac_online)
+       if (charger->prev_online != charger->online)
                power_supply_changed(charger->ac);
 
        ret = tps65217_reg_read(charger->tps, TPS65217_REG_CHGCONFIG0, &val);