From patchwork Thu Sep 2 10:16:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12471201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25386C432BE for ; Thu, 2 Sep 2021 10:19:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7A2A600AA for ; Thu, 2 Sep 2021 10:19:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E7A2A600AA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=R8Yrw9MNcc9UoWsMTIzVeWehIp6XZgcsePwLv+IrPuo=; b=oNrgN3aqn41TW6 iWU16gqAAP88RHwf9RnSSJsYyuYmkRgGRPo7jw7gX6u6pz1UWylErkju4rCVeAXyDXbSdEMaiMSFg K8fQqTIYPrnJ9j8m+MuIUJtaGsgRlh2OOw9DVtLUJvj/SLpvDg/dX0drOsvKC2mRq6kxMm9x2/zk/ Ka6HiKnjsbg5U70iL1aCCSKofSeoJqHTvYHoyrksu/Qaohl4BlUePT34SZK36lP5qqgHglbN6YdSC jznEwVMZ+MgI1X2BjnjNvVRyTHvoQ6PiS+aoEyT9zlvSiz/jWg7+SCQvyRwbLcP83vKNV9JvAmgwt PhuN0zLz6smdYA4xoxpw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLjmO-009Hx5-U1; Thu, 02 Sep 2021 10:17:09 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLjly-009Hto-MN for linux-arm-kernel@lists.infradead.org; Thu, 02 Sep 2021 10:16:47 +0000 Received: by mail-lj1-x234.google.com with SMTP id p15so2569269ljn.3 for ; Thu, 02 Sep 2021 03:16:42 -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 :mime-version:content-transfer-encoding; bh=XZIDc5dNGmZMEuNI+q0RXZg7TDaDyQay2EJwpX2HagA=; b=tJEyqv27c0M36cBiuxle+CZcejlnP42BqHYMsy3HH6riiEJsG+YpXDhRCks2ozu/0a YuXG3Fxzldz55lhNT71K7+qRshz8IyqqVyz2HmYf9jTDKw0jCy3PgRM96IBxbT8uJCDb FQVEoXVjv2YkFdPzs8JyfoTvs9cqJ3lQ7T21yNoEulElXLMqg5O1cNT1JvuikDEN+XGW hmX8t8qOEAbSrLsXUqtGNgo0+zISQLbbiCO2S5f/X3qavwykZZwIrxOhKUcfqe0n/Ljl YUMPiD+oIuf656o4snFxWRQSvao9oyutvr3Jb/HwWKASY4i/vU8L9O3bhDBhVe6+oxeF IdBg== 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:mime-version:content-transfer-encoding; bh=XZIDc5dNGmZMEuNI+q0RXZg7TDaDyQay2EJwpX2HagA=; b=NozbcadczMtnjiqfKrIWnqroAkt9OOHO3xccLbrFQn8VdJ29h5iEMLkziCnwPznBWA CNYdmZJ4LHbD70ApWEYt2HsjjEt/1Zo38ZAj/0ZTzC5wpkgjp28fH7rr1XzYlma6zvxs +g6PoDHpmkBEhFo3p03+hmstT9k2opHoouLJ5DF6cEfJPqidPL06/podK2DjrImMGzAN BCF1GVuL5BAe3pnk2wzcOJ6yo3/TwKFiWzC4rMZVTaQmMyRF8+10RHZW3KbkVL9ySQlb fRdizgU0qhnaPc9aQLSDojK7/DDd0Jd5RzUUbqHr2pvIqJZASDJTX5oiIy8D9q+xrZv6 kyjg== X-Gm-Message-State: AOAM533NUzlKNmDRQUUtXoC5vOCF7FwYEXwcggUQuvYYJ71SD3zv6yWX TqdJon/SUcIN6RiUCTgzSkJEnw== X-Google-Smtp-Source: ABdhPJzNXuvX9XDTeaJ02yQt2BdTC2X0ZlUZgbJYnh+m6n9auTpgMAN6FyCEd7d8q4RZ8DQBiAQ5Aw== X-Received: by 2002:a2e:b53a:: with SMTP id z26mr1803113ljm.95.1630577800779; Thu, 02 Sep 2021 03:16:40 -0700 (PDT) Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id s4sm155897lfd.53.2021.09.02.03.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 03:16:39 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Viresh Kumar , Dmitry Osipenko , linux-pm@vger.kernel.org Cc: Dmitry Baryshkov , Jonathan Hunter , Thierry Reding , Rajendra Nayak , Stephan Gerhold , Bjorn Andersson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH 2/3] PM: domains: Restructure some code in __genpd_dev_pm_attach() Date: Thu, 2 Sep 2021 12:16:33 +0200 Message-Id: <20210902101634.827187-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210902101634.827187-1-ulf.hansson@linaro.org> References: <20210902101634.827187-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210902_031642_770009_E085622E X-CRM114-Status: GOOD ( 16.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org To slightly improve readability of the code, but also to prepare for a subsequent change on top, let's move the code that calls of_get_required_opp_performance_state() into a new separate function. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 278e040f607f..800adf831cae 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2640,6 +2640,17 @@ static void genpd_dev_pm_sync(struct device *dev) genpd_queue_power_off_work(pd); } +static int genpd_get_default_performance_state(struct device *dev, + unsigned int index) +{ + int pstate = of_get_required_opp_performance_state(dev->of_node, index); + + if (pstate == -ENODEV || pstate == -EOPNOTSUPP) + return 0; + + return pstate; +} + static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, unsigned int index, bool power_on) { @@ -2690,8 +2701,8 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, } /* Set the default performance state */ - pstate = of_get_required_opp_performance_state(dev->of_node, index); - if (pstate < 0 && pstate != -ENODEV && pstate != -EOPNOTSUPP) { + pstate = genpd_get_default_performance_state(dev, index); + if (pstate < 0) { ret = pstate; goto err; } else if (pstate > 0) {