Use dmaenginem_async_device_register to simplify the code: remove dma_async_device_unregister. remove label err_unregister Signed-off-by: Huang Shijie <sjhuang@xxxxxxxxxxx> --- drivers/dma/dma-jz4740.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c index afd5e10f8927..30513a16e344 100644 --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -553,21 +553,19 @@ static int jz4740_dma_probe(struct platform_device *pdev) vchan_init(&chan->vchan, dd); } - ret = dma_async_device_register(dd); + ret = dmaenginem_async_device_register(dd); if (ret) goto err_clk; irq = platform_get_irq(pdev, 0); ret = request_irq(irq, jz4740_dma_irq, 0, dev_name(&pdev->dev), dmadev); if (ret) - goto err_unregister; + goto err_clk; platform_set_drvdata(pdev, dmadev); return 0; -err_unregister: - dma_async_device_unregister(dd); err_clk: clk_disable_unprepare(dmadev->clk); return ret; @@ -593,7 +591,6 @@ static int jz4740_dma_remove(struct platform_device *pdev) free_irq(irq, dmadev); jz4740_cleanup_vchan(&dmadev->ddev); - dma_async_device_unregister(&dmadev->ddev); clk_disable_unprepare(dmadev->clk); return 0; -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
