dmaengine: st_fdma: use dmaenginem_async_device_register to simplify the code
authorHuang Shijie <sjhuang@iluvatar.ai>
Mon, 6 Aug 2018 09:43:28 +0000 (17:43 +0800)
committerVinod Koul <vkoul@kernel.org>
Wed, 29 Aug 2018 16:13:17 +0000 (21:43 +0530)
Use dmaenginem_async_device_register to simplify the code:
remove dma_async_device_unregister.
remove label err_dma_dev

Signed-off-by: Huang Shijie <sjhuang@iluvatar.ai>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/st_fdma.c

index bfb79bd..07c20aa 100644 (file)
@@ -833,7 +833,7 @@ static int st_fdma_probe(struct platform_device *pdev)
        fdev->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
        fdev->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
 
-       ret = dma_async_device_register(&fdev->dma_device);
+       ret = dmaenginem_async_device_register(&fdev->dma_device);
        if (ret) {
                dev_err(&pdev->dev,
                        "Failed to register DMA device (%d)\n", ret);
@@ -844,15 +844,13 @@ static int st_fdma_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(&pdev->dev,
                        "Failed to register controller (%d)\n", ret);
-               goto err_dma_dev;
+               goto err_rproc;
        }
 
        dev_info(&pdev->dev, "ST FDMA engine driver, irq:%d\n", fdev->irq);
 
        return 0;
 
-err_dma_dev:
-       dma_async_device_unregister(&fdev->dma_device);
 err_rproc:
        st_fdma_free(fdev);
        st_slim_rproc_put(fdev->slim_rproc);
@@ -867,7 +865,6 @@ static int st_fdma_remove(struct platform_device *pdev)
        devm_free_irq(&pdev->dev, fdev->irq, fdev);
        st_slim_rproc_put(fdev->slim_rproc);
        of_dma_controller_free(pdev->dev.of_node);
-       dma_async_device_unregister(&fdev->dma_device);
 
        return 0;
 }