diff mbox

dmaengine: imx-sdma: fix merge conflict

Message ID 20160915155118.3008739-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann Sept. 15, 2016, 3:50 p.m. UTC
The sdma_handle_channel_loop() function was modified in one patch
and removed in another, and the merge between those patches left
an unused function in place:

drivers/dma/imx-sdma.c:673:13: error: 'sdma_handle_channel_loop' defined but not used [-Werror=unused-function]

This removes it again.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Fixes: 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
Fixes: 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
---
 drivers/dma/imx-sdma.c | 5 -----
 1 file changed, 5 deletions(-)

-- 
2.9.0
diff mbox

Patch

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 695f1603a224..7fb55ddf637b 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -670,11 +670,6 @@  static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int event)
 	writel_relaxed(val, sdma->regs + chnenbl);
 }
 
-static void sdma_handle_channel_loop(struct sdma_channel *sdmac)
-{
-	dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL);
-}
-
 static void sdma_update_channel_loop(struct sdma_channel *sdmac)
 {
 	struct sdma_buffer_descriptor *bd;