From patchwork Fri Apr 22 08:15:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 8906841 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9BE1BF440 for ; Fri, 22 Apr 2016 08:16:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB5742024F for ; Fri, 22 Apr 2016 08:16:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44DA220270 for ; Fri, 22 Apr 2016 08:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751955AbcDVIQK (ORCPT ); Fri, 22 Apr 2016 04:16:10 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:36637 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681AbcDVIQI (ORCPT ); Fri, 22 Apr 2016 04:16:08 -0400 Received: by mail-lf0-f41.google.com with SMTP id g184so74885597lfb.3 for ; Fri, 22 Apr 2016 01:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s9zeaFNgMr7jbLhtx80TOzjbRWCPGORdsgxurdmu24M=; b=MW4XfSxs2QiavS+SKyGk/2uf9+wVIYFKku5Q+jKE7+clnEwhfxzbmZStDMZyK6Br2o WlN25EIN4bZTdbIiTmIr+H9BeDnUTIbbNq1rPZ3+Kwc+dcdNekYRiyxiC+EDw2qulT3N 1DjFMXsFEj8oU7PRY8Bh78B1bSTyoMopArfZ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s9zeaFNgMr7jbLhtx80TOzjbRWCPGORdsgxurdmu24M=; b=GhYYFGnRCzxHdgVc+g17kPJT6biaf6rMmeh8M++Me9T8ltoiiprSorert7K+nwQ8EG VLjNLiXxMeWh/V0GI6N0lnURGNwNNVghqRyI4T3+T2821XmUOIE7RtCA64TBf6Q0NbSw v2VPMGpmnu/8o85j9cieP45QEOddMRymNnEbCnuWrad+7Xxm7qD2oHpERetR9TdfSYFN Ht5iOSdrLUVEk3Y4U/FOh2ctoPH8shg0ebfcatC/CtA2KFBPTWifDO8+4LM7Rn6kuvYB sta5Gl1mP/jqgJ0V+51QytqNw0rCF8rusnePYQm/HhK94/J/+5fkYbqdz14H0BY1Cth/ AoJg== X-Gm-Message-State: AOPr4FX+D2b1uy/Au0aaW/RqH7Ic87ZwVwwJK3gk9k6G4Xmd2Kb1z5Rvp2m4s4kfiyyUYesL X-Received: by 10.25.73.212 with SMTP id w203mr7085602lfa.22.1461312967005; Fri, 22 Apr 2016 01:16:07 -0700 (PDT) Received: from localhost.localdomain (h-155-4-128-67.na.cust.bahnhof.se. [155.4.128.67]) by smtp.gmail.com with ESMTPSA id v4sm1317109lbi.20.2016.04.22.01.16.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Apr 2016 01:16:05 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Geert Uytterhoeven , Lina Iyer , Axel Haslam , Marek Szyprowski , Jon Hunter , Andy Gross , Laurent Pinchart Subject: [PATCH 1/2] PM / Domains: Remove redundant pm_runtime_get|put*() in pm_genpd_prepare() Date: Fri, 22 Apr 2016 10:15:54 +0200 Message-Id: <1461312955-8547-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461312955-8547-1-git-send-email-ulf.hansson@linaro.org> References: <1461312955-8547-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The PM core increases the runtime PM usage count in the system PM prepare phase. This makes some of the pm_runtime_get|put*() calls in pm_gendp_prepare() redundant, so let's remove them. Signed-off-by: Ulf Hansson Reviewed-by: Kevin Hilman --- drivers/base/power/domain.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 4ce4ce0..60a3573 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -730,14 +730,11 @@ static int pm_genpd_prepare(struct device *dev) * at this point and a system wakeup event should be reported if it's * set up to wake up the system from sleep states. */ - pm_runtime_get_noresume(dev); if (pm_runtime_barrier(dev) && device_may_wakeup(dev)) pm_wakeup_event(dev, 0); - if (pm_wakeup_pending()) { - pm_runtime_put(dev); + if (pm_wakeup_pending()) return -EBUSY; - } if (resume_needed(dev, genpd)) pm_runtime_resume(dev); @@ -751,10 +748,8 @@ static int pm_genpd_prepare(struct device *dev) mutex_unlock(&genpd->lock); - if (genpd->suspend_power_off) { - pm_runtime_put_noidle(dev); + if (genpd->suspend_power_off) return 0; - } /* * The PM domain must be in the GPD_STATE_ACTIVE state at this point, @@ -776,7 +771,6 @@ static int pm_genpd_prepare(struct device *dev) pm_runtime_enable(dev); } - pm_runtime_put(dev); return ret; }