* [PATCH] dmaengine: imx-sdma: fix merge conflict
@ 2016-09-15 15:50 Arnd Bergmann
2016-09-22 11:42 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-09-15 15:50 UTC (permalink / raw)
To: Vinod Koul
Cc: Arnd Bergmann, Dan Williams, Fabio Estevam, Peter Senna Tschudin,
Greg Kroah-Hartman, Nandor Han, Dave Jiang, Michael Olbrich,
dmaengine, linux-kernel
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
2016-09-15 15:50 [PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann
@ 2016-09-22 11:42 ` Arnd Bergmann
2016-09-23 3:45 ` Vinod Koul
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-09-22 11:42 UTC (permalink / raw)
To: Vinod Koul
Cc: Dan Williams, Fabio Estevam, Peter Senna Tschudin,
Greg Kroah-Hartman, Nandor Han, Dave Jiang, Michael Olbrich,
dmaengine, linux-kernel
On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> 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")
> ---
Hi Vinod,
I still see the warning in linux-next, can you apply the patch?
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
2016-09-22 11:42 ` Arnd Bergmann
@ 2016-09-23 3:45 ` Vinod Koul
2016-10-04 7:43 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Vinod Koul @ 2016-09-23 3:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Dan Williams, Fabio Estevam, Peter Senna Tschudin,
Greg Kroah-Hartman, Nandor Han, Dave Jiang, Michael Olbrich,
dmaengine, linux-kernel
On Thu, Sep 22, 2016 at 01:42:35PM +0200, Arnd Bergmann wrote:
> On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> > 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")
> > ---
>
> Hi Vinod,
>
> I still see the warning in linux-next, can you apply the patch?
Applied, now. Sorry had missed earlier
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
2016-09-23 3:45 ` Vinod Koul
@ 2016-10-04 7:43 ` Arnd Bergmann
2016-10-04 8:02 ` Vinod Koul
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-10-04 7:43 UTC (permalink / raw)
To: Vinod Koul
Cc: Dan Williams, Fabio Estevam, Peter Senna Tschudin,
Greg Kroah-Hartman, Nandor Han, Dave Jiang, Michael Olbrich,
dmaengine, linux-kernel
On Friday, September 23, 2016 9:15:57 AM CEST Vinod Koul wrote:
> On Thu, Sep 22, 2016 at 01:42:35PM +0200, Arnd Bergmann wrote:
> > On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> > > 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")
> > > ---
> >
> > Hi Vinod,
> >
> > I still see the warning in linux-next, can you apply the patch?
>
> Applied, now. Sorry had missed earlier
The problem was fixed after you applied the patch, but it seems the
same one is now back in linux-next.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
2016-10-04 7:43 ` Arnd Bergmann
@ 2016-10-04 8:02 ` Vinod Koul
0 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2016-10-04 8:02 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Dan Williams, Fabio Estevam, Peter Senna Tschudin,
Greg Kroah-Hartman, Nandor Han, Dave Jiang, Michael Olbrich,
dmaengine, linux-kernel
On Tue, Oct 04, 2016 at 09:43:16AM +0200, Arnd Bergmann wrote:
> On Friday, September 23, 2016 9:15:57 AM CEST Vinod Koul wrote:
> > On Thu, Sep 22, 2016 at 01:42:35PM +0200, Arnd Bergmann wrote:
> > > On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> > > > 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")
> > > > ---
> > >
> > > Hi Vinod,
> > >
> > > I still see the warning in linux-next, can you apply the patch?
> >
> > Applied, now. Sorry had missed earlier
>
> The problem was fixed after you applied the patch, but it seems the
> same one is now back in linux-next.
Opps I am sorry for that.
To prepare for pull request I rebased my next, and I fixed it while merging
with tty. I was planning to send this to Linus as reference.
But then i had to redo this as I merged some other code not going
for 4.9 and messed up in second try.
Thanks for pointing it out. It is fixed now and pushed
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-04 7:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-15 15:50 [PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann
2016-09-22 11:42 ` Arnd Bergmann
2016-09-23 3:45 ` Vinod Koul
2016-10-04 7:43 ` Arnd Bergmann
2016-10-04 8:02 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).