From patchwork Tue Apr 11 11:59:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Breck X-Patchwork-Id: 9675013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4015600CB for ; Tue, 11 Apr 2017 12:00:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0B2928448 for ; Tue, 11 Apr 2017 12:00:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D53882855A; Tue, 11 Apr 2017 12:00:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C5AE28448 for ; Tue, 11 Apr 2017 12:00:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623AbdDKMAF (ORCPT ); Tue, 11 Apr 2017 08:00:05 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35766 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752134AbdDKMAE (ORCPT ); Tue, 11 Apr 2017 08:00:04 -0400 Received: by mail-pf0-f193.google.com with SMTP id a188so4746785pfa.2 for ; Tue, 11 Apr 2017 05:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vI/ElNru84uwD8MI627RAVROcJ2EXTUpnATsKi0WUWo=; b=bvWX3qm+t5ke7HIVvw4qhGjoqy7yuBWThK+rsvJWk6zkJTrvHStXvk9p37dCdsoWuy FN+kZZRi+7+RqpAvoDn8wZ9/u5N9xJxnEgC0mt/HgqBZ/pGR6b82OEJ69/3yXXgIuI6N 5r/9iZutvcvxSMAGDMSgiB3o7cUCQ9j0S9aMlYHvGriQkmf4qvNqGx30UmtdmOSIpmiW Vu9EhPn5ZAEt1GSyZQaQyaxVwRL/B3b0ruivElJ6vh8Qd1YIFu99CzAsJWzUebJYbdrX aT7w55lprYnMfF3vhklT9Q/3UsL0ZFwTt1iP9gongpp/8lQgSgDufH9mYKOon3uh36nL B4ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vI/ElNru84uwD8MI627RAVROcJ2EXTUpnATsKi0WUWo=; b=fmu56AYHGpB5zg/PSeiitL9RAQTeEEh1UmA1HriPxaSdFS7ZPo3ip0UrPEuepnBgn7 qVBQqYGkImmr9OWpKQ+AJD8jf9GD2l9v9ixbNhH+y+7otwwBDY6aTtueMxkBL4Jduu1A T5QS94xsgXluHLoM63FGdE8SjUWioPsYY9El8K0O/k3NDFTQT1Ted7UOwWVwoVb4RqHI e5Q8Kvr61xVApjgMk1aySFD1SeQzy+zQMjM7kClV34e4vc8Q7tJUCj0fb0lnUK/5fJZZ jNDh3rHo+VEMKlMtlcx5JhwDcKmDxdV4EShuEBdoDAr4CfjlsPkK4T0EJttSMmwDv7/g O3+g== X-Gm-Message-State: AFeK/H1h347c/8GRKc8JSbGqB5K1ldGZgxRvyhI38ju3N3IT2dBVVdx3JTB/jnnIzu7Snw== X-Received: by 10.84.140.235 with SMTP id 98mr75211720plt.161.1491912003283; Tue, 11 Apr 2017 05:00:03 -0700 (PDT) Received: from localhost.localdomain (c-73-223-93-234.hsd1.ca.comcast.net. [73.223.93.234]) by smtp.gmail.com with ESMTPSA id d3sm30444736pgc.37.2017.04.11.05.00.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 05:00:02 -0700 (PDT) From: Liam Breck To: Sebastian Reichel , linux-pm@vger.kernel.org Cc: Tony Lindgren , Hans de Goede , Liam Breck Subject: [PATCH v5 3/4] power: bq24190_charger: Uniform pm_runtime_get() failure handling Date: Tue, 11 Apr 2017 04:59:56 -0700 Message-Id: <20170411115957.14253-4-liam@networkimprov.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170411115957.14253-1-liam@networkimprov.net> References: <20170411115957.14253-1-liam@networkimprov.net> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Liam Breck On pm_runtime_get() failure, always emit an error message. Prevent unbalanced pm_runtime_get by calling: pm_runtime_put_noidle() in irq handler pm_runtime_put_sync() on any probe() failure Rename probe() out labels instead of renumbering them. Fixes: 13d6fa8447fa ("power: bq24190_charger: Use PM runtime autosuspend") Cc: Tony Lindgren Cc: Hans de Goede Signed-off-by: Liam Breck Acked-by: Tony Lindgren Reviewed-by: Hans de Goede --- drivers/power/supply/bq24190_charger.c | 37 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 69cd344..a904abb 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -1280,12 +1280,13 @@ static void bq24190_check_status(struct bq24190_dev_info *bdi) static irqreturn_t bq24190_irq_handler_thread(int irq, void *data) { struct bq24190_dev_info *bdi = data; - int ret; + int error; bdi->irq_event = true; - ret = pm_runtime_get_sync(bdi->dev); - if (ret < 0) { - dev_warn(bdi->dev, "pm_runtime_get failed: %i\n", ret); + error = pm_runtime_get_sync(bdi->dev); + if (error < 0) { + dev_warn(bdi->dev, "pm_runtime_get failed: %i\n", error); + pm_runtime_put_noidle(bdi->dev); return IRQ_NONE; } bq24190_check_status(bdi); @@ -1453,13 +1454,15 @@ static int bq24190_probe(struct i2c_client *client, pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, 600); ret = pm_runtime_get_sync(dev); - if (ret < 0) - goto out1; + if (ret < 0) { + dev_err(dev, "pm_runtime_get failed: %i\n", ret); + goto out_pmrt; + } ret = bq24190_hw_init(bdi); if (ret < 0) { dev_err(dev, "Hardware init failed\n"); - goto out2; + goto out_pmrt; } charger_cfg.drv_data = bdi; @@ -1470,7 +1473,7 @@ static int bq24190_probe(struct i2c_client *client, if (IS_ERR(bdi->charger)) { dev_err(dev, "Can't register charger\n"); ret = PTR_ERR(bdi->charger); - goto out2; + goto out_pmrt; } battery_cfg.drv_data = bdi; @@ -1479,13 +1482,13 @@ static int bq24190_probe(struct i2c_client *client, if (IS_ERR(bdi->battery)) { dev_err(dev, "Can't register battery\n"); ret = PTR_ERR(bdi->battery); - goto out3; + goto out_charger; } ret = bq24190_sysfs_create_group(bdi); if (ret) { dev_err(dev, "Can't create sysfs entries\n"); - goto out4; + goto out_battery; } bdi->initialized = true; @@ -1496,7 +1499,7 @@ static int bq24190_probe(struct i2c_client *client, "bq24190-charger", bdi); if (ret < 0) { dev_err(dev, "Can't set up irq handler\n"); - goto out5; + goto out_sysfs; } if (bdi->extcon) { @@ -1506,7 +1509,7 @@ static int bq24190_probe(struct i2c_client *client, &bdi->extcon_nb); if (ret) { dev_err(dev, "Can't register extcon\n"); - goto out5; + goto out_sysfs; } /* Sync initial cable state */ @@ -1520,19 +1523,17 @@ static int bq24190_probe(struct i2c_client *client, return 0; -out5: +out_sysfs: bq24190_sysfs_remove_group(bdi); -out4: +out_battery: power_supply_unregister(bdi->battery); -out3: +out_charger: power_supply_unregister(bdi->charger); -out2: +out_pmrt: pm_runtime_put_sync(dev); - -out1: pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); return ret;