From d9ac174917561c498ee02a4f683c1e297ddeb1ee Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 16 Aug 2019 15:40:58 +0200 Subject: [PATCH] max77818-charger: drop max77818_charger_init_dev and max77818_charger_exit_dev These two functions now only enable/disable charger and are called by max77818_do_irq(). Let's simplify the code a little bit by drop the functions and call max77818_charger_set_enable() from max77818_do_irq() directly. While at it, flip the order of dev_info() message output and max77818_charger_set_enable() call, as it's more natural to print the event message and then take action on the event. Signed-off-by: Shawn Guo --- drivers/power/supply/max77818-charger.c | 48 ++++--------------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/drivers/power/supply/max77818-charger.c b/drivers/power/supply/max77818-charger.c index 971497624eb9..d360d58c373e 100644 --- a/drivers/power/supply/max77818-charger.c +++ b/drivers/power/supply/max77818-charger.c @@ -666,32 +666,6 @@ static int max77818_charger_property_is_writeable(struct power_supply *psy, } } -static int max77818_charger_exit_dev(struct max77818_charger *chg) -{ - int ret; - - ret = max77818_charger_set_enable(chg, false); - if (ret) { - dev_err(chg->dev, "failed to disable charger: %d\n", ret); - return ret; - } - - return 0; -} - -static int max77818_charger_init_dev(struct max77818_charger *chg) -{ - int ret; - - ret = max77818_charger_set_enable(chg, true); - if (ret) { - dev_err(chg->dev, "failed to enable charger: %d\n", ret); - return ret; - } - - return 0; -} - static void max77818_do_irq(struct max77818_charger *chg) { struct device *dev = chg->dev; @@ -704,31 +678,21 @@ static void max77818_do_irq(struct max77818_charger *chg) chg_input = max77818_charger_chgin_present(chg); wc_input = max77818_charger_wcin_present(chg); - if (!wc_input) { - /* init/exit if only CHGIN is present */ - if (chg_input) - max77818_charger_init_dev(chg); - else - max77818_charger_exit_dev(chg); - } - dev_info(dev, "CHGIN input %s\n", chg_input ? "inserted" : "removed"); + /* if CHGIN is the only present charger */ + if (!wc_input) + max77818_charger_set_enable(chg, chg_input ? 1 : 0); break; case CHG_INT_WCIN_I: chg_input = max77818_charger_chgin_present(chg); wc_input = max77818_charger_wcin_present(chg); - if (!chg_input) { - /* init/exit if only WCIN is present */ - if (wc_input) - max77818_charger_init_dev(chg); - else - max77818_charger_exit_dev(chg); - } - dev_info(dev, "WCIN input %s\n", wc_input ? "inserted" : "removed"); + /* if WCIN is the only present charger */ + if (!chg_input) + max77818_charger_set_enable(chg, wc_input ? 1 : 0); break; default: break;