From patchwork Wed Jun 7 12:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 104494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp331394rwl; Wed, 7 Jun 2023 05:50:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BGTeg7plbSm4evAdIF5aADJFVq4TdAyxroLawC4yVOwLM35ERlQjuZz2DAsxEAukJnmFB X-Received: by 2002:a05:6a00:1504:b0:65b:ccb0:8f00 with SMTP id q4-20020a056a00150400b0065bccb08f00mr6919761pfu.4.1686142207119; Wed, 07 Jun 2023 05:50:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686142207; cv=none; d=google.com; s=arc-20160816; b=Nlnrmo6oOimEm3qdNz+IWLia0NRhKniJzVCTjlkwpsLZwH+CuCfU5gGSsvoGueVi+z ndMq9uQ3bbTwJue7f+sF1h3TehrNaahPvE+TefAI26oQzv4lm90JWN7zOyaVazNCk6WV STFcJyizT/ZeMhyAa6DrYTW/7r/08uuPfEElx8UFsA80BfbYuMZoXUEo7qsXNX9O/Dwg rPDfHd/O+C2yTuzQOOVhuVPHOiPHfjJ3gi3xFeBqIVoNlUGOtIdrftBig+LnN5jUM33T ZIpxY1b2Vg4radaAFnjoSWz9FvgZmh8BUWOEogNXIbK5cJDdAf8HKNVC4r6rpQ06SC+O r6hg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4b5Qrnd5i2zJnrU79sLpQmCBr/qGSSDn3CP8EHjD6U4=; b=IWLfkd09aKCowTxXJ/FQ4jJ08iIahRba8r2PE4WrQjJL0D9GYpALLONA0JIdMonvAW iKVcgjwLjW8Ic1GIHRwMlmC+7j1NowUVaW1v8VPKBo5484YpusUM6uA9EZHK/rn/94Wl Xut7cpOV+sdRW24i5RviSUUbvh+AdW1yTXALYC918VbxQFpZOhXpiLy54a44CbD000eR mvvnKxVy/0iDF9XsMpRRC7jcQmZk4T6Ulz1gnIVKXuoZl6L+etdhpzWDLqEIod5nM3UD Ur++hWyoU25PJvcBx6BiHNmjEon7jhh8ugWGljnth+jfJrhqra+RXiTzPGSyyS5YDmH7 6nDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XpdKTgk1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d27-20020aa797bb000000b0064388918719si8583270pfq.85.2023.06.07.05.49.52; Wed, 07 Jun 2023 05:50:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XpdKTgk1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240580AbjFGMry (ORCPT + 99 others); Wed, 7 Jun 2023 08:47:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240743AbjFGMr2 (ORCPT ); Wed, 7 Jun 2023 08:47:28 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CAB31FFA for ; Wed, 7 Jun 2023 05:47:15 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4f505aace48so9204412e87.0 for ; Wed, 07 Jun 2023 05:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686142033; x=1688734033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4b5Qrnd5i2zJnrU79sLpQmCBr/qGSSDn3CP8EHjD6U4=; b=XpdKTgk1cDCNQQWTJx9Ik39EP7iB/XP9x8fLotqVKs5E477dudxeo7Fsr2smRNd8+T xIYKUBjmq1dI7sWLCfrfhPLDSEoSUdIig2/ZWCafAOVvs9avBLCodWD/W6kc+9MNfo4Q p5FaAOor/pyoO4fd1HWKz1rMMRIQil0+8oNeVFXaoAgEDtgyj0xtVjDjfJjcuHf3BEvb nXZbmt3RkadgB8PHOSDl0q5p45JA+ZMqI+gSVLy9HwjIVlv+87yDk0vDIMsqkEQ+eD7E 5bPMSpYlkZXG8tibzBW8nrKec3MR+meotBXU985AI1YPcZ1rZfzCt6yOoGM8axVAApmC 0DHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686142033; x=1688734033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4b5Qrnd5i2zJnrU79sLpQmCBr/qGSSDn3CP8EHjD6U4=; b=KnRAvr8n3jH+x7ns1PLdnEUJc6Czx4cHHDKJYhUKue1h99N3e8Sb47redqRcDLnHvA GV62ydJKFA+MXB9lWrYpFpP6XzSgmddvomEu4NU3QlhxVksVbmPBW28tRyMHGVL9uvgF 6Fg/RoibO8ws1t6Yc8pNHWNeHk8MElgbq+QsKNmo/YmRl0m2zaLbmzn78pnriBm36LsL t7ExM/v6dCWQO69h4oCjZJlGZXkgmlKr7kRZDpugwfrbQi7dYC3tnKF6NtCIc4vYKMdk qiHdkWyrtRwF2LexYBlcUipUBToyOCfcKcxixJgisz+Fn6QJj7EhuyqAgHdofA+UA5vG ZgyQ== X-Gm-Message-State: AC+VfDzhvb/ZNNfsDawikCAfwBYrQmTdzqwCRTQFQ9cb5vQjJGg2aF+h Vp/CYcKB8zUftDu3ipN4vQuhXA== X-Received: by 2002:a19:6756:0:b0:4f6:47a2:7bb4 with SMTP id e22-20020a196756000000b004f647a27bb4mr133291lfj.60.1686142033767; Wed, 07 Jun 2023 05:47:13 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id z7-20020a19f707000000b004f4b3e9e0cesm1781708lfe.297.2023.06.07.05.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 05:47:13 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Cristian Marussi , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Nikunj Kela , Prasad Sodagudi , Alexandre Torgue , Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 14/16] firmware: arm_scmi: Simplify error path in scmi_dvfs_device_opps_add() Date: Wed, 7 Jun 2023 14:46:26 +0200 Message-Id: <20230607124628.157465-15-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607124628.157465-1-ulf.hansson@linaro.org> References: <20230607124628.157465-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768048251257952224?= X-GMAIL-MSGID: =?utf-8?q?1768048251257952224?= Let's simplify the code in scmi_dvfs_device_opps_add() by using dev_pm_opp_remove_all_dynamic() in its error path. Signed-off-by: Ulf Hansson --- drivers/firmware/arm_scmi/perf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 9c5340f590e4..03a496ccc603 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -585,23 +585,18 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph, { int idx, ret; unsigned long freq; - struct scmi_opp *opp; struct perf_dom_info *dom; struct scmi_perf_info *pi = ph->get_priv(ph); dom = pi->dom_info + domain; - for (opp = dom->opp, idx = 0; idx < dom->opp_count; idx++, opp++) { - freq = opp->perf * dom->mult_factor; + for (idx = 0; idx < dom->opp_count; idx++) { + freq = dom->opp[idx].perf * dom->mult_factor; ret = dev_pm_opp_add(dev, freq, 0); if (ret) { dev_warn(dev, "failed to add opp %luHz\n", freq); - - while (idx-- > 0) { - freq = (--opp)->perf * dom->mult_factor; - dev_pm_opp_remove(dev, freq); - } + dev_pm_opp_remove_all_dynamic(dev); return ret; } }