Use dmaenginem_async_device_register to simplify the code: remove dma_async_device_unregister remove label unregister Signed-off-by: Huang Shijie <sjhuang@xxxxxxxxxxx> --- drivers/dma/img-mdc-dma.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/dma/img-mdc-dma.c b/drivers/dma/img-mdc-dma.c index 25cec9c243e1..1e555ac62b1e 100644 --- a/drivers/dma/img-mdc-dma.c +++ b/drivers/dma/img-mdc-dma.c @@ -1001,21 +1001,19 @@ static int mdc_dma_probe(struct platform_device *pdev) return ret; } - ret = dma_async_device_register(&mdma->dma_dev); + ret = dmaenginem_async_device_register(&mdma->dma_dev); if (ret) goto suspend; ret = of_dma_controller_register(pdev->dev.of_node, mdc_of_xlate, mdma); if (ret) - goto unregister; + goto suspend; dev_info(&pdev->dev, "MDC with %u channels and %u threads\n", mdma->nr_channels, mdma->nr_threads); return 0; -unregister: - dma_async_device_unregister(&mdma->dma_dev); suspend: if (!pm_runtime_enabled(&pdev->dev)) img_mdc_runtime_suspend(&pdev->dev); @@ -1029,7 +1027,6 @@ static int mdc_dma_remove(struct platform_device *pdev) struct mdc_chan *mchan, *next; of_dma_controller_free(pdev->dev.of_node); - dma_async_device_unregister(&mdma->dma_dev); list_for_each_entry_safe(mchan, next, &mdma->dma_dev.channels, vc.chan.device_node) { -- 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