From patchwork Mon Sep 13 13:13:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509730 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp548064jao; Mon, 13 Sep 2021 06:19:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYNdgsbS3VitRsTFhYqB5vckZoOD8MJKX3Kpt+iKY4/qpaxpACcoKsbpjVzjp2cJ4G8KmY X-Received: by 2002:a6b:f610:: with SMTP id n16mr9152022ioh.139.1631539198675; Mon, 13 Sep 2021 06:19:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631539198; cv=none; d=google.com; s=arc-20160816; b=gRYF8SzIpgigdt4L7758eccWRMFBm47Y7zJ+3olwiSBuVad4mnvktoO1eYmSaU0eEd xdZnbc99/Ym/0O9voMlNklX5Z1Pl/13Dif2XhV5PP1PtararJWKtQxpjIuSOYfYkyYrA mKNshdgEvTxoM5jiehP8hc7fAgbtNFIvkG7VF9ApD9cRNlkIuZFxqrU8paFSxP6MXls/ kX1s7yBknqEh3Jarm0dPIfCa34omqyWCHi970jr2Gpqr9xTSrsFQADFLjQNO5xsZAVGc pA5BKvyZ5DiYnK4EwGlfAuJ0dOF0diWwdA9Kqt1sgPuxlxF/ZnVwG+X6cLd3yT39Fyb4 a/Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZbQZoof08nElfLgD+8YCl6KmDr8fvYpasIpPI5uYPos=; b=0hBPw2RjJdKwzmkj1zHEEmOkj2uXloSAMubvrf0duzexYTDcUdVQ7+VMGLJs5su4Tn RPge4Np8MQYGWyd/A32n8xNvZS6dKqNH5dV5Ybbozg3Ej3ENzczL8Pl7QEiczg5KAl9Y dsDHDHJ9VUCOmkxOpCRSoON/QtuQzCgOXmxkfRsOmEi/3b0/yRualYuAM1PP8tuRnGav +B3Po+KufWdEwfAW7TE7BVMBDdHLA36AtpxkEZtjjJd/vdzSnEDI5h2329VNVPd764O6 50yopI31bDW+uVNEjMf+C3xkRrVEQEcn8kblJA6/TxykGRGyjkjHdLmEk3wXpj3FDttC tDiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ds8gj8Fe; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t10si6489823jaa.114.2021.09.13.06.19.58; Mon, 13 Sep 2021 06:19:58 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ds8gj8Fe; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238630AbhIMNVL (ORCPT + 11 others); Mon, 13 Sep 2021 09:21:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:34856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239614AbhIMNUe (ORCPT ); Mon, 13 Sep 2021 09:20:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E2EB2610A3; Mon, 13 Sep 2021 13:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631539139; bh=PKMhz0ebKCsIG/+kx1GjqvcY4PBBlBtlCPpFstCHtSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ds8gj8FegKb33PpljeFQcFbEaOYL3p+3xcnJigBI71TRddYtfU9qAvMJggEJ/SzLr tbgljFWlEYZ009tO7Jmvq26cQIatrFMOcFo8XnuTOiSK2f6hvg5YhzGaQUSp3X8IO3 zaTuKBN3lw9ufXcSLxfWQZmfIdjn8YNlR7K86UdQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rajendra Nayak , Stephen Boyd , Sibi Sankar , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.4 054/144] soc: qcom: rpmhpd: Use corner in power_off Date: Mon, 13 Sep 2021 15:13:55 +0200 Message-Id: <20210913131049.746780199@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131047.974309396@linuxfoundation.org> References: <20210913131047.974309396@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit d43b3a989bc8c06fd4bbb69a7500d180db2d68e8 ] rpmhpd_aggregate_corner() takes a corner as parameter, but in rpmhpd_power_off() the code requests the level of the first corner instead. In all (known) current cases the first corner has level 0, so this change should be a nop, but in case that there's a power domain with a non-zero lowest level this makes sure that rpmhpd_power_off() actually requests the lowest level - which is the closest to "power off" we can get. While touching the code, also skip the unnecessary zero-initialization of "ret". Fixes: 279b7e8a62cc ("soc: qcom: rpmhpd: Add RPMh power domain driver") Reviewed-by: Rajendra Nayak Reviewed-by: Stephen Boyd Reviewed-by: Sibi Sankar Tested-by: Sibi Sankar Link: https://lore.kernel.org/r/20210703005416.2668319-2-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/rpmhpd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/soc/qcom/rpmhpd.c index 51850cc68b70..aa24237a7840 100644 --- a/drivers/soc/qcom/rpmhpd.c +++ b/drivers/soc/qcom/rpmhpd.c @@ -235,12 +235,11 @@ static int rpmhpd_power_on(struct generic_pm_domain *domain) static int rpmhpd_power_off(struct generic_pm_domain *domain) { struct rpmhpd *pd = domain_to_rpmhpd(domain); - int ret = 0; + int ret; mutex_lock(&rpmhpd_lock); - ret = rpmhpd_aggregate_corner(pd, pd->level[0]); - + ret = rpmhpd_aggregate_corner(pd, 0); if (!ret) pd->enabled = false;