From nobody Wed Apr 8 04:41:10 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F0A8E3DCDB8; Tue, 10 Mar 2026 18:41:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773168092; cv=none; b=hUc/26v5HIhF0oLM+m0C7fRxxhq2EGjgBfaraxgfGfNCZaN2OL2akWG0X2fIjnjvXZMPsueGDztYg3H/kl+bZVetPL8bzuigAE/nASViNd2PQ/v81mX4lyvOutLHQwBvGPs3y5hDNRJmDyQkg510PRaQ8F8Z2xigo9cTH+v5tKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773168092; c=relaxed/simple; bh=eL8cNPPMXiZclbubgOaXwi19oqnawiSQo1n5NvEj14Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ShemV3rDUlxcXPY6KLBfZBq6rdUtK1xCp+j9pw4UI9iUZMqd3J41pYuwNAqhdQ395GPkriOs+XmFJLnfC0CN+gHiHKQH+P+ls5kUpP20rJlwENPBw/GxPYcHwVlcGYh8QUU/b58zHrXX65zXn1gtlDR67jQrKu0pz8aYCqv3tqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ECDE81A00; Tue, 10 Mar 2026 11:41:15 -0700 (PDT) Received: from pluto.guest.local (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F0DF73F7BD; Tue, 10 Mar 2026 11:41:18 -0700 (PDT) From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org, linux-clk@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: sudeep.holla@arm.com, philip.radford@arm.com, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@foss.st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, dan.carpenter@linaro.org, geert+renesas@glider.be, kuninori.morimoto.gx@renesas.com, marek.vasut+renesas@gmail.com, Cristian Marussi Subject: [PATCH v2 10/13] firmware: arm_scmi: Refactor iterators internal allocation Date: Tue, 10 Mar 2026 18:40:27 +0000 Message-ID: <20260310184030.3669330-11-cristian.marussi@arm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310184030.3669330-1-cristian.marussi@arm.com> References: <20260310184030.3669330-1-cristian.marussi@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use cleanup handlers to manage iterator data structures. No functional change. Signed-off-by: Cristian Marussi Reviewed-by: Peng Fan --- drivers/firmware/arm_scmi/driver.c | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 3e76a3204ba4..4bd069da879e 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -17,6 +17,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 #include +#include #include #include #include @@ -1789,39 +1790,41 @@ static void *scmi_iterator_init(const struct scmi_p= rotocol_handle *ph, size_t tx_size, void *priv) { int ret; - struct scmi_iterator *i; =20 - i =3D devm_kzalloc(ph->dev, sizeof(*i), GFP_KERNEL); + struct scmi_iterator *i __free(kfree) =3D kzalloc(sizeof(*i), GFP_KERNEL); if (!i) return ERR_PTR(-ENOMEM); =20 + if (!ops || !ph) + return ERR_PTR(-EINVAL); + i->ph =3D ph; i->ops =3D ops; i->priv =3D priv; =20 ret =3D ph->xops->xfer_get_init(ph, msg_id, tx_size, 0, &i->t); - if (ret) { - devm_kfree(ph->dev, i); + if (ret) return ERR_PTR(ret); - } =20 i->state.max_resources =3D max_resources; i->msg =3D i->t->tx.buf; i->resp =3D i->t->rx.buf; =20 - return i; + return no_free_ptr(i); } =20 static int scmi_iterator_run(void *iter) { - int ret =3D -EINVAL; + int ret; struct scmi_iterator_ops *iops; const struct scmi_protocol_handle *ph; struct scmi_iterator_state *st; - struct scmi_iterator *i =3D iter; =20 - if (!i || !i->ops || !i->ph) - return ret; + if (!iter) + return -EINVAL; + + /* Take ownership of the iterator */ + struct scmi_iterator *i __free(kfree) =3D iter; =20 iops =3D i->ops; ph =3D i->ph; @@ -1846,12 +1849,12 @@ static int scmi_iterator_run(void *iter) break; } =20 - for (st->loop_idx =3D 0; st->loop_idx < st->num_returned; - st->loop_idx++) { + for (st->loop_idx =3D 0; !ret && st->loop_idx < st->num_returned; + st->loop_idx++) ret =3D iops->process_response(ph, i->resp, st, i->priv); - if (ret) - goto out; - } + + if (ret) + break; =20 st->desc_index +=3D st->num_returned; ph->xops->reset_rx_to_maxsz(ph, i->t); @@ -1861,10 +1864,8 @@ static int scmi_iterator_run(void *iter) */ } while (st->num_returned && st->num_remaining); =20 -out: /* Finalize and destroy iterator */ ph->xops->xfer_put(ph, i->t); - devm_kfree(ph->dev, i); =20 return ret; } --=20 2.53.0