From nobody Tue Dec 2 03:02:38 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F0702D0616; Mon, 17 Nov 2025 16:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396005; cv=none; b=CdBdOV17pXhECeDLF8NI5tZJ3SNa9lDiimjQPztCc+LwvF/4zAMKwfR2oouN2BO/e32058OhZX7S4kUUYQtjvxlaj6AKNAcK2+WRHWSXFFNKdFsE4XJol2+MknxgONgGyYf6kRgTdqVdO55OhhLo+h3shMp7oSNDIesfiRfsA+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763396005; c=relaxed/simple; bh=a/z8oiJ1emaOdi37ui+TS+tLvLimlhxJjpEUmOHOftw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LP2YBwEGXGMEWUT5O91kDx4hnX/Xh7kKtFVUV+WSq0JjPkSNu4bi1pnPWJx2iNKiN1CI0ZBttzABTezJNi8zBMFRs/9Vu3Y0cYQJa7TLMVG4WlracFSC4S0kAzZ5aCMXs7YFYCThbau404ENGQipFkzikRlO58ntqGLXk6T1Y/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jHPMA0X1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jHPMA0X1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42927C2BCB3; Mon, 17 Nov 2025 16:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763396005; bh=a/z8oiJ1emaOdi37ui+TS+tLvLimlhxJjpEUmOHOftw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jHPMA0X1ANaCFuJeKjxmU3tWhGqJ7obpUxJjBttqM/CPJvhOL1lkOywb1invE8fbF K/9OLZAfIz1lxZDANrcw7yGpvDoW8OhZECYt+nB5xUIpqlQ7/C0n62wfinBBpdeaSG xYYfqOJ7zmDDFl7bdpMUmq5EKqmjuVSwSf4OG9cbTtxz6ytxj/FPSC9p/d7prNxNpQ u5tGxPSFTd5ZksmQ+Dk3LciDbhWC4FF+zFOKXXyTbhl9J01etFv9RwLzC2DK8TQV0K Iti36CDYqHoGJdj/1IGYy9dfZjwarlLeWr7vGpXQ/p6FKJwkcnmqyrzqOZNrMq7okp GJwXiZ5zSw2SQ== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1vL1r1-000000002o8-1Gcc; Mon, 17 Nov 2025 17:13:23 +0100 From: Johan Hovold To: Vinod Koul Cc: Ludovic Desroches , Viresh Kumar , Andy Shevchenko , Vinicius Costa Gomes , Dave Jiang , Vladimir Zapolskiy , Piotr Wojtaszczyk , =?UTF-8?q?Am=C3=A9lie=20Delaunay?= , Maxime Coquelin , Alexandre Torgue , Peter Ujfalusi , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 11/15] dmaengine: stm32: dmamux: clean up route allocation error labels Date: Mon, 17 Nov 2025 17:12:54 +0100 Message-ID: <20251117161258.10679-13-johan@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251117161258.10679-1-johan@kernel.org> References: <20251117161258.10679-1-johan@kernel.org> 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" Error labels should be named after what they do (and not after wherefrom they are jumped to). Signed-off-by: Johan Hovold Reviewed-by: Amelie Delaunay --- drivers/dma/stm32/stm32-dmamux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/dma/stm32/stm32-dmamux.c b/drivers/dma/stm32/stm32-dma= mux.c index 2bd218dbabbb..db13498b9c9f 100644 --- a/drivers/dma/stm32/stm32-dmamux.c +++ b/drivers/dma/stm32/stm32-dmamux.c @@ -118,7 +118,7 @@ static void *stm32_dmamux_route_allocate(struct of_phan= dle_args *dma_spec, spin_unlock_irqrestore(&dmamux->lock, flags); dev_err(&pdev->dev, "Run out of free DMA requests\n"); ret =3D -ENOMEM; - goto error_chan_id; + goto err_free_mux; } set_bit(mux->chan_id, dmamux->dma_inuse); spin_unlock_irqrestore(&dmamux->lock, flags); @@ -135,7 +135,7 @@ static void *stm32_dmamux_route_allocate(struct of_phan= dle_args *dma_spec, dma_spec->np =3D of_parse_phandle(ofdma->of_node, "dma-masters", i - 1); if (!dma_spec->np) { dev_err(&pdev->dev, "can't get dma master\n"); - goto error; + goto err_clear_inuse; } =20 /* Set dma request */ @@ -167,10 +167,9 @@ static void *stm32_dmamux_route_allocate(struct of_pha= ndle_args *dma_spec, =20 err_put_dma_spec_np: of_node_put(dma_spec->np); -error: +err_clear_inuse: clear_bit(mux->chan_id, dmamux->dma_inuse); - -error_chan_id: +err_free_mux: kfree(mux); err_put_pdev: put_device(&pdev->dev); --=20 2.51.0