summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Shijie <sjhuang@iluvatar.ai>2018-08-06 05:43:28 -0400
committerVinod Koul <vkoul@kernel.org>2018-08-29 12:13:17 -0400
commita5c1d8ec733cc354e810bbc30dc0904ddd684976 (patch)
treeb134f79d9dcac51ab1a559e7fc6600e08a8d7722
parent5b394b2ddf0347bef56e50c69a58773c94343ff3 (diff)
dmaengine: st_fdma: use dmaenginem_async_device_register to simplify the code
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>
-rw-r--r--drivers/dma/st_fdma.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c
index bfb79bd0c6de..07c20aa2e955 100644
--- a/drivers/dma/st_fdma.c
+++ b/drivers/dma/st_fdma.c
@@ -833,7 +833,7 @@ static int st_fdma_probe(struct platform_device *pdev)
833 fdev->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); 833 fdev->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
834 fdev->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; 834 fdev->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
835 835
836 ret = dma_async_device_register(&fdev->dma_device); 836 ret = dmaenginem_async_device_register(&fdev->dma_device);
837 if (ret) { 837 if (ret) {
838 dev_err(&pdev->dev, 838 dev_err(&pdev->dev,
839 "Failed to register DMA device (%d)\n", ret); 839 "Failed to register DMA device (%d)\n", ret);
@@ -844,15 +844,13 @@ static int st_fdma_probe(struct platform_device *pdev)
844 if (ret) { 844 if (ret) {
845 dev_err(&pdev->dev, 845 dev_err(&pdev->dev,
846 "Failed to register controller (%d)\n", ret); 846 "Failed to register controller (%d)\n", ret);
847 goto err_dma_dev; 847 goto err_rproc;
848 } 848 }
849 849
850 dev_info(&pdev->dev, "ST FDMA engine driver, irq:%d\n", fdev->irq); 850 dev_info(&pdev->dev, "ST FDMA engine driver, irq:%d\n", fdev->irq);
851 851
852 return 0; 852 return 0;
853 853
854err_dma_dev:
855 dma_async_device_unregister(&fdev->dma_device);
856err_rproc: 854err_rproc:
857 st_fdma_free(fdev); 855 st_fdma_free(fdev);
858 st_slim_rproc_put(fdev->slim_rproc); 856 st_slim_rproc_put(fdev->slim_rproc);
@@ -867,7 +865,6 @@ static int st_fdma_remove(struct platform_device *pdev)
867 devm_free_irq(&pdev->dev, fdev->irq, fdev); 865 devm_free_irq(&pdev->dev, fdev->irq, fdev);
868 st_slim_rproc_put(fdev->slim_rproc); 866 st_slim_rproc_put(fdev->slim_rproc);
869 of_dma_controller_free(pdev->dev.of_node); 867 of_dma_controller_free(pdev->dev.of_node);
870 dma_async_device_unregister(&fdev->dma_device);
871 868
872 return 0; 869 return 0;
873} 870}