Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932771AbcLIHti (ORCPT ); Fri, 9 Dec 2016 02:49:38 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33564 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbcLIHtf (ORCPT ); Fri, 9 Dec 2016 02:49:35 -0500 From: Milo Kim To: Sebastian Reichel Cc: Enric Balletbo i Serra , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Milo Kim Subject: [PATCH v2 4/8] power: supply: tps65217: Use generic name for charger online Date: Fri, 9 Dec 2016 16:49:02 +0900 Message-Id: <20161209074906.27545-5-woogyom.kim@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161209074906.27545-1-woogyom.kim@gmail.com> References: <20161209074906.27545-1-woogyom.kim@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2144 Lines: 74 This driver supports AC and USB chargers. Generic name is preferred. Replace 'ac_online' with 'online'. Signed-off-by: Milo Kim --- drivers/power/supply/tps65217_charger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/tps65217_charger.c b/drivers/power/supply/tps65217_charger.c index 482ee9f..424a6d3 100644 --- a/drivers/power/supply/tps65217_charger.c +++ b/drivers/power/supply/tps65217_charger.c @@ -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); -- 2.9.3