On Fri, Aug 30, 2024 at 05:41:15PM +0800, Liao Yuanhong wrote:
> Use devm_clk_get_enabled() instead of clk functions in imx-dma.
>
> Signed-off-by: Liao Yuanhong <liaoyuanhong@xxxxxxxx>
Reviewed-by: Frank Li <Frank.Li@xxxxxxx>
> ---
> v2:use dev_err_probe() instead of warn msg and return value.
> ---
> drivers/dma/imx-dma.c | 59 +++++++++++++++----------------------------
> 1 file changed, 20 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> index ebf7c115d553..7178e9643102 100644
> --- a/drivers/dma/imx-dma.c
> +++ b/drivers/dma/imx-dma.c
> @@ -1039,6 +1039,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
> struct imxdma_engine *imxdma;
> int ret, i;
> int irq, irq_err;
> + struct clk *dma_ahb, *dma_ipg;
>
> imxdma = devm_kzalloc(&pdev->dev, sizeof(*imxdma), GFP_KERNEL);
> if (!imxdma)
> @@ -1055,20 +1056,13 @@ static int __init imxdma_probe(struct platform_device *pdev)
> if (irq < 0)
> return irq;
>
> - imxdma->dma_ipg = devm_clk_get(&pdev->dev, "ipg");
> - if (IS_ERR(imxdma->dma_ipg))
> - return PTR_ERR(imxdma->dma_ipg);
> + dma_ipg = devm_clk_get_enabled(&pdev->dev, "ipg");
> + if (IS_ERR(dma_ipg))
> + return PTR_ERR(dma_ipg);
>
> - imxdma->dma_ahb = devm_clk_get(&pdev->dev, "ahb");
> - if (IS_ERR(imxdma->dma_ahb))
> - return PTR_ERR(imxdma->dma_ahb);
> -
> - ret = clk_prepare_enable(imxdma->dma_ipg);
> - if (ret)
> - return ret;
> - ret = clk_prepare_enable(imxdma->dma_ahb);
> - if (ret)
> - goto disable_dma_ipg_clk;
> + dma_ahb = devm_clk_get_enabled(&pdev->dev, "ahb");
> + if (IS_ERR(dma_ahb))
> + return PTR_ERR(dma_ahb);
>
> /* reset DMA module */
> imx_dmav1_writel(imxdma, DCR_DRST, DMA_DCR);
> @@ -1076,24 +1070,22 @@ static int __init imxdma_probe(struct platform_device *pdev)
> if (is_imx1_dma(imxdma)) {
> ret = devm_request_irq(&pdev->dev, irq,
> dma_irq_handler, 0, "DMA", imxdma);
> - if (ret) {
> - dev_warn(imxdma->dev, "Can't register IRQ for DMA\n");
> - goto disable_dma_ahb_clk;
> - }
> + if (ret)
> + return dev_err_probe(imxdma->dev, ret, "Can't register IRQ for DMA\n");
> +
> imxdma->irq = irq;
>
> irq_err = platform_get_irq(pdev, 1);
> if (irq_err < 0) {
> ret = irq_err;
> - goto disable_dma_ahb_clk;
> + return ret;
> }
>
> ret = devm_request_irq(&pdev->dev, irq_err,
> imxdma_err_handler, 0, "DMA", imxdma);
> - if (ret) {
> - dev_warn(imxdma->dev, "Can't register ERRIRQ for DMA\n");
> - goto disable_dma_ahb_clk;
> - }
> + if (ret)
> + return dev_err_probe(imxdma->dev, ret, "Can't register ERRIRQ for DMA\n");
> +
> imxdma->irq_err = irq_err;
> }
>
> @@ -1126,12 +1118,10 @@ static int __init imxdma_probe(struct platform_device *pdev)
> if (!is_imx1_dma(imxdma)) {
> ret = devm_request_irq(&pdev->dev, irq + i,
> dma_irq_handler, 0, "DMA", imxdma);
> - if (ret) {
> - dev_warn(imxdma->dev, "Can't register IRQ %d "
> - "for DMA channel %d\n",
> - irq + i, i);
> - goto disable_dma_ahb_clk;
> - }
> + if (ret)
> + return dev_err_probe(imxdma->dev, ret,
> + "Can't register IRQ %d for DMA channel %d\n",
> + irq + i, i);
>
> imxdmac->irq = irq + i;
> timer_setup(&imxdmac->watchdog, imxdma_watchdog, 0);
> @@ -1172,10 +1162,8 @@ static int __init imxdma_probe(struct platform_device *pdev)
> dma_set_max_seg_size(imxdma->dma_device.dev, 0xffffff);
>
> ret = dma_async_device_register(&imxdma->dma_device);
> - if (ret) {
> - dev_err(&pdev->dev, "unable to register\n");
> - goto disable_dma_ahb_clk;
> - }
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "unable to register\n");
>
> if (pdev->dev.of_node) {
> ret = of_dma_controller_register(pdev->dev.of_node,
> @@ -1190,10 +1178,6 @@ static int __init imxdma_probe(struct platform_device *pdev)
>
> err_of_dma_controller:
> dma_async_device_unregister(&imxdma->dma_device);
> -disable_dma_ahb_clk:
> - clk_disable_unprepare(imxdma->dma_ahb);
> -disable_dma_ipg_clk:
> - clk_disable_unprepare(imxdma->dma_ipg);
> return ret;
> }
>
> @@ -1226,9 +1210,6 @@ static void imxdma_remove(struct platform_device *pdev)
>
> if (pdev->dev.of_node)
> of_dma_controller_free(pdev->dev.of_node);
> -
> - clk_disable_unprepare(imxdma->dma_ipg);
> - clk_disable_unprepare(imxdma->dma_ahb);
> }
>
> static struct platform_driver imxdma_driver = {
> --
> 2.25.1
>
