Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] dmaengine: imx-sdma: fix merge conflict | Date | Thu, 15 Sep 2016 17:50:49 +0200 |
| |
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(-)
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; -- 2.9.0
| |