From nobody Thu Oct 2 20:44:50 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 CE9B62E03EF for ; Thu, 11 Sep 2025 21:56:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757627820; cv=none; b=NVQMdZ50I1QD2VqqJf2kx3oWYWwV2SjuSJhA1cubWTwokanlQwxd1WSn4i8kVBjMaA9/607HwlyHy0tUCYr00B1X4OOjyb1I4hnhU76ikOf5db7+de+wZInsQbmZI9bUXnan7cI+bzriktkqsqOMx915Eu4w0u52o1K9pg8459g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757627820; c=relaxed/simple; bh=0Z7xBaweOqz5htFkvcQWh3jEoPpIESsJuZDczDl62SU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TIvIQs1RQ2DoflHodowLJ5RSeVVdxLi5KcYmIL+fAh7NJjvDQN57Kt4rMelN0CLN2pz+eEO4CYst107J46JTWyg+Smlx28ME9O/IR0LjnAaWF8OkYwuFi8c1YQgTB/fdaGKn0bX5uAMfh9mUm8ElUNoJSCdNpwCP3GVoybRw+Fc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uwpHe-0004g5-BD; Thu, 11 Sep 2025 23:56:50 +0200 From: Marco Felsch Date: Thu, 11 Sep 2025 23:56:48 +0200 Subject: [PATCH v2 07/10] dmaengine: imx-sdma: make use of devm_clk_get_prepared() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250911-v6-16-topic-sdma-v2-7-d315f56343b5@pengutronix.de> References: <20250911-v6-16-topic-sdma-v2-0-d315f56343b5@pengutronix.de> In-Reply-To: <20250911-v6-16-topic-sdma-v2-0-d315f56343b5@pengutronix.de> To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Jiada Wang Cc: dmaengine@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marco Felsch , Frank Li X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Make use of the devm_clk_get_prepared() to cleanup the error handling during probe() and to automatically unprepare the clock during remove. Reviewed-by: Frank Li Signed-off-by: Marco Felsch Reviewed-by: Peng Fan --- drivers/dma/imx-sdma.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index d6239900ba12063bdb7d807db1bdbdc2b446a94c..d39589c20c4b2a26d0239feb86c= ce8d5a0f5acdd 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -2300,26 +2300,18 @@ static int sdma_probe(struct platform_device *pdev) if (IS_ERR(sdma->regs)) return PTR_ERR(sdma->regs); =20 - sdma->clk_ipg =3D devm_clk_get(dev, "ipg"); + sdma->clk_ipg =3D devm_clk_get_prepared(dev, "ipg"); if (IS_ERR(sdma->clk_ipg)) return PTR_ERR(sdma->clk_ipg); =20 - sdma->clk_ahb =3D devm_clk_get(dev, "ahb"); + sdma->clk_ahb =3D devm_clk_get_prepared(dev, "ahb"); if (IS_ERR(sdma->clk_ahb)) return PTR_ERR(sdma->clk_ahb); =20 - ret =3D clk_prepare(sdma->clk_ipg); - if (ret) - return ret; - - ret =3D clk_prepare(sdma->clk_ahb); - if (ret) - goto err_clk; - ret =3D devm_request_irq(dev, irq, sdma_int_handler, 0, dev_name(dev), sdma); if (ret) - goto err_irq; + return ret; =20 sdma->irq =3D irq; =20 @@ -2360,11 +2352,11 @@ static int sdma_probe(struct platform_device *pdev) =20 ret =3D sdma_init(sdma); if (ret) - goto err_irq; + return ret; =20 ret =3D sdma_event_remap(sdma); if (ret) - goto err_irq; + return ret; =20 if (sdma->drvdata->script_addrs) sdma_add_scripts(sdma, sdma->drvdata->script_addrs); @@ -2393,7 +2385,7 @@ static int sdma_probe(struct platform_device *pdev) ret =3D dma_async_device_register(&sdma->dma_device); if (ret) { dev_err(dev, "unable to register\n"); - goto err_irq; + return ret; } =20 ret =3D of_dma_controller_register(np, sdma_xlate, sdma); @@ -2421,10 +2413,7 @@ static int sdma_probe(struct platform_device *pdev) =20 err_register: dma_async_device_unregister(&sdma->dma_device); -err_irq: - clk_unprepare(sdma->clk_ahb); -err_clk: - clk_unprepare(sdma->clk_ipg); + return ret; } =20 @@ -2436,8 +2425,6 @@ static void sdma_remove(struct platform_device *pdev) of_dma_controller_free(sdma->dev->of_node); devm_free_irq(&pdev->dev, sdma->irq, sdma); dma_async_device_unregister(&sdma->dma_device); - clk_unprepare(sdma->clk_ahb); - clk_unprepare(sdma->clk_ipg); /* Kill the tasklet */ for (i =3D 0; i < MAX_DMA_CHANNELS; i++) { struct sdma_channel *sdmac =3D &sdma->channel[i]; --=20 2.47.3