diff options
| author | Vinod Koul | 2018-10-24 10:15:43 +0200 |
|---|---|---|
| committer | Vinod Koul | 2018-10-24 10:15:43 +0200 |
| commit | b8bb45cbb3873f38715471726530eedf39a13ac7 (patch) | |
| tree | 16cedc02d890f85450df659996fda7fa90553e2f /drivers/dma/mmp_tdma.c | |
| parent | Merge branch 'topic/dirn_remove' into for-linus (diff) | |
| parent | dmaengine: pxa: fix semicolon.cocci warnings (diff) | |
| download | kernel-qcow2-linux-b8bb45cbb3873f38715471726530eedf39a13ac7.tar.gz kernel-qcow2-linux-b8bb45cbb3873f38715471726530eedf39a13ac7.tar.xz kernel-qcow2-linux-b8bb45cbb3873f38715471726530eedf39a13ac7.zip | |
Merge branch 'topic/dmam' into for-linus
Diffstat (limited to 'drivers/dma/mmp_tdma.c')
| -rw-r--r-- | drivers/dma/mmp_tdma.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index c14f8820a567..0c56faa03e9a 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@ -548,9 +548,6 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan) static int mmp_tdma_remove(struct platform_device *pdev) { - struct mmp_tdma_device *tdev = platform_get_drvdata(pdev); - - dma_async_device_unregister(&tdev->device); return 0; } @@ -714,7 +711,7 @@ static int mmp_tdma_probe(struct platform_device *pdev) dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); platform_set_drvdata(pdev, tdev); - ret = dma_async_device_register(&tdev->device); + ret = dmaenginem_async_device_register(&tdev->device); if (ret) { dev_err(tdev->device.dev, "unable to register\n"); return ret; @@ -726,7 +723,7 @@ static int mmp_tdma_probe(struct platform_device *pdev) if (ret) { dev_err(tdev->device.dev, "failed to register controller\n"); - dma_async_device_unregister(&tdev->device); + return ret; } } |