From patchwork Mon Sep 25 13:17:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13397791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5CFCCCE7A95 for ; Mon, 25 Sep 2023 13:18:44 +0000 (UTC) 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=1jr4DejOZ2XGeqCeFEIDU8gJ6RavsTyoi3OSClIrjdg=; b=xvJHfk5LhpzALA OPDRnys0LDFg0aMlIdWitmoGyf7FMVYnsjyb3I6rcj3y+wEWZeleSiFeK181rVcbfoDS3H3kpTOh7 zSJcI2S+aW66DnP/FNhUDRbn45Q5SnBo4zXRQ9a7yTsntJe7f1MsDbQPMy00m/9mdO8ubLS1/boXl OkrStWVMvbM/HEAN0+27R6+PRG6unPmSRP4q3wmzWrYVj/gecr30goY8POAUcGS8D6J6Bqm7vuib4 flDDF1pV1964ktGXG5YgNj5LhqWRidEaSsrOskycNJgFZIc/mQ0SJ/QOJ8W0+DouYR6SZ5R2OTCH0 tzKCbUFI7l/9VZl2lMsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qklTe-00EJXX-0z; Mon, 25 Sep 2023 13:18:18 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qklTR-00EJQi-0H for linux-arm-kernel@lists.infradead.org; Mon, 25 Sep 2023 13:18:06 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5041d6d8b10so10562721e87.2 for ; Mon, 25 Sep 2023 06:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695647883; x=1696252683; darn=lists.infradead.org; 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=wxw1p33YOE1Wx3IdS6/yDe9IgDNF8zci3+vg+kboqRc=; b=QQD+avgaFNFamFWupPbhTXz3408bC3JQ8Df+W5gbXyqrvPTcY2qS5atMvIn+/hwDi9 0F04x5Alb+4zZPo3CPzYcXd1rvJjYISt86BY+LI6qO/XBV+lgNfzuhUkg8ooBO7EwBzo ItX5Yv8yCtmG8RuelHa7DsB93V6T5ygOHl1NQ9oEX1TO6fmU6ZnUab+eK88dhjL3dtd1 KKxq5NEeou6WOIcX/NcLVXlqYCkcQa/J2cPJCojGrFaFTsmwWc2GZ2dtNF3xZUjt71bu 79Ol2r7+N43BXNuxO7X4BAeK39I5l3zEw+hRAtBQRxWEVOFr3YejZSxucNw5dKsqv8Et FYkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695647883; x=1696252683; 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=wxw1p33YOE1Wx3IdS6/yDe9IgDNF8zci3+vg+kboqRc=; b=U2p46/jjirhjUetGy+kTi9Cg9sxr0b2045v0+tBPdtICORNCScOjvuIjckuf1/asYo Mnc0A7AYs9silR+n71vMCvrrvaWRvovFabwkbNkPcVaLDOW6aGA4PUxtPx8p42ju2J68 yZc+H5iuIKuiHD1Zh99q1m3Q99uLfw+U3hoCxbqMW1sndkjMM0q+9OSICMK0Vfjorpa6 B9M60LDpuOusR96pfpeanOZ126AAQtANCK9xObvx/mQxyX/xPOCMcq4bqZ9erV83fapU Iy9RbHTwjy8L3w5tDPC1u2ScGMXwL2oCvCoks1mwMU2TkqQ9oiDp9VlbIKJG6IV8ycaW JwZw== X-Gm-Message-State: AOJu0YyPLq1TpB6vMjDgyclrDjFQ6LiFX7cyuzfnVLnE6uD2kwLg/HyJ AdH/1NjWYPu44nPh/rVSoESV4lqmYVmqnJo8Xbc= X-Google-Smtp-Source: AGHT+IFNueuLCXRNbVrLA4eVjJu12iokEykiWxOyhkw7rPrvIF7kGqhFmBrd80yDDQXxWRiDucIYXA== X-Received: by 2002:a05:6512:308c:b0:500:79f7:1738 with SMTP id z12-20020a056512308c00b0050079f71738mr5892894lfd.17.1695647883494; Mon, 25 Sep 2023 06:18:03 -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 m29-20020a056512015d00b004fe10276bbfsm1823583lfo.296.2023.09.25.06.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 06:18:02 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Cristian Marussi , Viresh Kumar , "Rafael J . Wysocki" Cc: Nishanth Menon , Stephen Boyd , 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 7/9] firmware: arm_scmi: Simplify error path in scmi_dvfs_device_opps_add() Date: Mon, 25 Sep 2023 15:17:13 +0200 Message-Id: <20230925131715.138411-8-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230925131715.138411-1-ulf.hansson@linaro.org> References: <20230925131715.138411-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-20230925_061805_128793_8D84D5F1 X-CRM114-Status: GOOD ( 13.36 ) 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 Let's simplify the code in scmi_dvfs_device_opps_add() by using dev_pm_opp_remove_all_dynamic() in the error path. Signed-off-by: Ulf Hansson --- drivers/firmware/arm_scmi/perf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 9eb58df9124d..733c5ebeb555 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -787,30 +787,22 @@ 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; dom = scmi_perf_domain_lookup(ph, domain); if (IS_ERR(dom)) return PTR_ERR(dom); - for (opp = dom->opp, idx = 0; idx < dom->opp_count; idx++, opp++) { + for (idx = 0; idx < dom->opp_count; idx++) { if (!dom->level_indexing_mode) - freq = opp->perf * dom->mult_factor; + freq = dom->opp[idx].perf * dom->mult_factor; else - freq = opp->indicative_freq * 1000; + freq = dom->opp[idx].indicative_freq * 1000; ret = dev_pm_opp_add(dev, freq, 0); if (ret) { dev_warn(dev, "failed to add opp %luHz\n", freq); - - while (idx-- > 0) { - if (!dom->level_indexing_mode) - freq = (--opp)->perf * dom->mult_factor; - else - freq = (--opp)->indicative_freq * 1000; - dev_pm_opp_remove(dev, freq); - } + dev_pm_opp_remove_all_dynamic(dev); return ret; }