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: 10364995 X-Patchwork-Delegate: rjw@sisk.pl 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 AC23C602DC for ; Thu, 26 Apr 2018 08:53:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C6282907F for ; Thu, 26 Apr 2018 08:53:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FAC32908D; Thu, 26 Apr 2018 08:53:33 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 3D10B2907F for ; Thu, 26 Apr 2018 08:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754778AbeDZIxb (ORCPT ); Thu, 26 Apr 2018 04:53:31 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:43686 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754728AbeDZIxW (ORCPT ); Thu, 26 Apr 2018 04:53:22 -0400 Received: by mail-lf0-f65.google.com with SMTP id g12-v6so13437323lfb.10 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=McbdiJ7C5ZtuA4rcExiRD4585vlAVCMtERzi9J7vnm1e1TUCRf+lapvWLrJfVzXtma jBQqcI3jppv4ugzXvB7GV785JpyFFJ17EOphn2Rt5ogc0hiBGRGPgBmsgyEhUe+AZF0d LEWCjsyjxlp/Dkgx9weKiIxcuEwFEvGMqJ5zo2KKB7XOjl7KI72Fo/nzVAEtYkvHyVv5 ayB9CtCIl1sCfdmK7Di/HJT9zP6LvV2UqaKBuZot+Xv+4pX9s0aXGDido9/iS30rqy4S LkZ0beKeyh02ISJfMZ/e1y02q+KgblURt+2xh3023SbP7LfVtuSYmF+6/b2saAETJQAO kNaw== X-Gm-Message-State: ALQs6tAh0ZdVylPCarBGfo/S2mlyOPeljsuqhYLverRLDFpvM6kvl6fq 5C+4ElVGfUPMZv3k1UdQWBUlHg== 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 Cc: Ulf Hansson , Kevin Hilman , Geert Uytterhoeven , Viresh Kumar , Vincent Guittot , Mark Brown , Vinod Koul , Sanyog Kale , Pierre-Louis Bossart , Wolfram Sang , Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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> 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 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)