From patchwork Thu Apr 26 08:53:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10365029 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 B3EDE601D3 for ; Thu, 26 Apr 2018 08:54:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A36FB2907F for ; Thu, 26 Apr 2018 08:54:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 984EE2908D; Thu, 26 Apr 2018 08:54:56 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E782E29089 for ; Thu, 26 Apr 2018 08:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=d6RkRhbkEUVoNHEaHQzG6AjN7Dd9rf20lW38sOEBkl8=; b=bLtXUFlBIl/RxLHMOMx9Pyis3b jKronapDcVoYI1eLtwfZ+SsQ8xumUgBpSqvEhRfqTl44gfGjhbTGhkYxxF5NSkMOsC4s4MzHdswwN IjkQ2vFvIiOh8KT8FfodEiif2BDrF4mLFR8KECLvG+Xt7zOv55MXQkibC+51k/fhKKQCNy4gri62K 4KMmJ2B01UXsoBSkI4+1B/JY+g7Oa6p5D+bhX14C38IWgndR3ERrv5PO9GQ4v80appXnhP0Z4hyDs MgJ1vbZJRVBUJncztAy0PUOyVC70+2e2dd9gBPv2SyYHIcqBxzUWemlJOz4mPZx/UWC1AI5+KUGe1 xhb2PYng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBcfs-00058U-22; Thu, 26 Apr 2018 08:54:44 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBced-0004Xk-Ie for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 08:53:39 +0000 Received: by mail-lf0-x241.google.com with SMTP id d20-v6so29537580lfe.3 for ; Thu, 26 Apr 2018 01:53:22 -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=0GyqQznU278kM2emAIQfIFInCTzuUYGErGb1DqJIbtQ=; b=ZVBeT7vEelur7ywutblazacQt0thtbPcy1AA8wejXPWGHVfsi/gGd4fLGNwS+z2SS/ kYsNNEb+O18tpmTu/p8kJgSTja7Sjq5GmT/ZT0PEEKzebodwJBs2N8dw40eHtKGPs0dD IHibcnOYi/1lJbzJqJaVLdUoItTMnG7U5vT8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0GyqQznU278kM2emAIQfIFInCTzuUYGErGb1DqJIbtQ=; b=hq8Mm+faWkUb/YKSUg+/cNsBCV9OG+yV7muZlUY8SYHxnMu6QsshaRfqM7wV3vP+hz SlSHdfDpMRkq9vW7JBp+zOxr1SZN0gduSchkl9DJ7ENh5/sE9at3STWXrNzAmb3mjcXK cU21mX1HMjGv41WFMVaBkMuzK7RTJly+RgA54Aun6tdRww/0EHJZx27yfGSoKmO+I9AE 18KTBWH3zThwGXKL+8D8JFTVZocsbYWE8kWZi4Im/UQlD9QW88QKQx7uPxQ3r3i0TlZG tb6UrWbvE1ffm7HxLBKgApcBu4peR7cDMWiZVzP0m8VIAlDC5mTr6V/YxPUPXjXUEWNS UV6g== X-Gm-Message-State: ALQs6tD8EkRUqkMuIGr2E8BZBd34x4sSxtZEWUBD9yAOLInf1udSpjo5 T0xjzv6Z3KyOF0CgZaAO6f8G/w== X-Google-Smtp-Source: AB8JxZpUhL3m3fgj9e1oO7eZFkyPRdW/mrAPcSsU4ZM6YwUIxSxl70Afa/JiuZr1NtwnnRR3A0mMKg== X-Received: by 2002:a19:1462:: with SMTP id k95-v6mr16871980lfi.23.1524732801276; Thu, 26 Apr 2018 01:53:21 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id u83-v6sm681097lff.65.2018.04.26.01.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 01:53:20 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-pm@vger.kernel.org Subject: [PATCH 04/11] PM / Domains: Check for existing PM domain in dev_pm_domain_attach() Date: Thu, 26 Apr 2018 10:53:03 +0200 Message-Id: <1524732790-2234-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> References: <1524732790-2234-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_015327_681998_B7F0304E X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , Vincent Guittot , Geert Uytterhoeven , Kevin Hilman , Vinod Koul , Viresh Kumar , Wolfram Sang , Pierre-Louis Bossart , Russell King , Mark Brown , linux-arm-kernel@lists.infradead.org, Sanyog Kale , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of checking if an existing PM domain pointer has been assigned in genpd_dev_pm_attach() and acpi_dev_pm_attach(), move the check to the common path in dev_pm_domain_attach(), thus potentially avoid one unnecessary check. Signed-off-by: Ulf Hansson --- drivers/acpi/device_pm.c | 3 --- drivers/base/power/common.c | 3 +++ drivers/base/power/domain.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 3d96e4d..d006300 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1259,9 +1259,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) if (!adev) return -ENODEV; - if (dev->pm_domain) - return -EEXIST; - /* * Only attach the power domain to the first device if the * companion is shared by multiple. This is to prevent doing power diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index f6a9ad5..f3cf61f 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -104,6 +104,9 @@ int dev_pm_domain_attach(struct device *dev, bool power_on) { int ret; + if (dev->pm_domain) + return -EEXIST; + ret = acpi_dev_pm_attach(dev, power_on); if (ret) ret = genpd_dev_pm_attach(dev); diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index d4b96ed..b816adb 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2194,9 +2194,6 @@ int genpd_dev_pm_attach(struct device *dev) if (!dev->of_node) return -ENODEV; - if (dev->pm_domain) - return -EEXIST; - ret = of_parse_phandle_with_args(dev->of_node, "power-domains", "#power-domain-cells", 0, &pd_args); if (ret < 0)