Use dmaenginem_async_device_register to simplify the code: remove dma_async_device_unregister remove label err_register_of_dma,err_register_memcpy Signed-off-by: Huang Shijie <sjhuang@xxxxxxxxxxx> --- drivers/dma/coh901318.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index da74fd74636b..ff29f2f6ce3b 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -2690,7 +2690,7 @@ static int __init coh901318_probe(struct platform_device *pdev) base->dma_slave.device_terminate_all = coh901318_terminate_all; base->dma_slave.dev = &pdev->dev; - err = dma_async_device_register(&base->dma_slave); + err = dmaenginem_async_device_register(&base->dma_slave); if (err) goto err_register_slave; @@ -2717,15 +2717,15 @@ static int __init coh901318_probe(struct platform_device *pdev) * i.e. 2^2 */ base->dma_memcpy.copy_align = DMAENGINE_ALIGN_4_BYTES; - err = dma_async_device_register(&base->dma_memcpy); + err = dmaenginem_async_device_register(&base->dma_memcpy); if (err) - goto err_register_memcpy; + goto err_register_slave; err = of_dma_controller_register(pdev->dev.of_node, coh901318_xlate, base); if (err) - goto err_register_of_dma; + goto err_register_slave; platform_set_drvdata(pdev, base); dev_info(&pdev->dev, "Initialized COH901318 DMA on virtual base 0x%p\n", @@ -2733,10 +2733,6 @@ static int __init coh901318_probe(struct platform_device *pdev) return err; - err_register_of_dma: - dma_async_device_unregister(&base->dma_memcpy); - err_register_memcpy: - dma_async_device_unregister(&base->dma_slave); err_register_slave: coh901318_pool_destroy(&base->pool); return err; @@ -2767,8 +2763,6 @@ static int coh901318_remove(struct platform_device *pdev) coh901318_base_remove(base, dma_memcpy_channels); of_dma_controller_free(pdev->dev.of_node); - dma_async_device_unregister(&base->dma_memcpy); - dma_async_device_unregister(&base->dma_slave); coh901318_pool_destroy(&base->pool); 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
