Message ID | 20181105194503.25639-1-daniel@zonque.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [RESEND] dmaengine: pxa: make the filter function internal | expand |
Daniel Mack <daniel@zonque.org> writes: > From: Robert Jarzmik <robert.jarzmik@free.fr> > > As the pxa architecture and all its related drivers do not rely anymore > on the filter function, thanks to the slave map conversion, make > pxad_filter_fn() static, and remove it from the global namespace. > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > Acked-by: Vinod Koul <vkoul@kernel.org> > --- > > I'm resending this as it appears to be the last patch that's missing > from the PXA DMA transition series. > > Robert, any reason why it wasn't applied? Ah this is because my pull request was ... not taken into account. Arnd, Kevin, Olof, did you receive this https://www.spinics.net/lists/arm-kernel/msg679383.html ? It might be my mailer getting me into trouble once more. Cheers. -- Robert
On Mon, Nov 5, 2018 at 2:37 PM Robert Jarzmik <robert.jarzmik@free.fr> wrote: > > Daniel Mack <daniel@zonque.org> writes: > > > From: Robert Jarzmik <robert.jarzmik@free.fr> > > > > As the pxa architecture and all its related drivers do not rely anymore > > on the filter function, thanks to the slave map conversion, make > > pxad_filter_fn() static, and remove it from the global namespace. > > > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > > Acked-by: Vinod Koul <vkoul@kernel.org> > > --- > > > > I'm resending this as it appears to be the last patch that's missing > > from the PXA DMA transition series. > > > > Robert, any reason why it wasn't applied? > Ah this is because my pull request was ... not taken into account. > > Arnd, Kevin, Olof, did you receive this > https://www.spinics.net/lists/arm-kernel/msg679383.html ? It might be my mailer > getting me into trouble once more. I only have a record of the DT pull request here, so yeah, something must have happened to that one. It's odd that it got to the archive but not my mail client though. Either that, or it got labelled as Spam and auto-purged since it was a little while ago. In the future, if we haven't merged in 1 or 2 weeks, feel free to ping. -Olof -Olof
Olof Johansson <olof@lixom.net> writes: > On Mon, Nov 5, 2018 at 2:37 PM Robert Jarzmik <robert.jarzmik@free.fr> wrote: >> > Robert, any reason why it wasn't applied? >> Ah this is because my pull request was ... not taken into account. >> >> Arnd, Kevin, Olof, did you receive this >> https://www.spinics.net/lists/arm-kernel/msg679383.html ? It might be my mailer >> getting me into trouble once more. > > I only have a record of the DT pull request here, so yeah, something > must have happened to that one. It's odd that it got to the archive > but not my mail client though. > > Either that, or it got labelled as Spam and auto-purged since it was a > little while ago. > > In the future, if we haven't merged in 1 or 2 weeks, feel free to ping. Okay, but not worries, that's more a "cleanup" stuff which can miss one cycle. It was so small I didn't even bother checking linux-next at the time, and it will just shift to the next pull request. Cheers.
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 825725057e00..c7a328f81485 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -179,7 +179,7 @@ static unsigned int pxad_drcmr(unsigned int line) return 0x1000 + line * 4; } -bool pxad_filter_fn(struct dma_chan *chan, void *param); +static bool pxad_filter_fn(struct dma_chan *chan, void *param); /* * Debug fs @@ -1500,7 +1500,7 @@ static struct platform_driver pxad_driver = { .remove = pxad_remove, }; -bool pxad_filter_fn(struct dma_chan *chan, void *param) +static bool pxad_filter_fn(struct dma_chan *chan, void *param) { struct pxad_chan *c = to_pxad_chan(chan); struct pxad_param *p = param; @@ -1513,7 +1513,6 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param) return true; } -EXPORT_SYMBOL_GPL(pxad_filter_fn); module_platform_driver(pxad_driver); diff --git a/include/linux/dma/pxa-dma.h b/include/linux/dma/pxa-dma.h index 9fc594f69eff..fceb5df07097 100644 --- a/include/linux/dma/pxa-dma.h +++ b/include/linux/dma/pxa-dma.h @@ -23,15 +23,4 @@ struct pxad_param { enum pxad_chan_prio prio; }; -struct dma_chan; - -#ifdef CONFIG_PXA_DMA -bool pxad_filter_fn(struct dma_chan *chan, void *param); -#else -static inline bool pxad_filter_fn(struct dma_chan *chan, void *param) -{ - return false; -} -#endif - #endif /* _PXA_DMA_H_ */