This pxa update brings only a single patch, finishing the

dmaengine conversion.
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEExgkueSa0u8n4Ls+HA/Z63R24yxIFAlwFrA4XHHJvYmVydC5q
 YXJ6bWlrQGZyZWUuZnIACgkQA/Z63R24yxKcbA//WjGBVxISzeEeA2rrZ7byyJrE
 R8vjV3lcblbbHyNvQdbhcLGs2mZCGAWdOaf/Q2rRLevUmetPgjHY2iCiupxnoOp0
 5OgfGHYDjbxNth2drkx8pb5jTbzp/6EkQvutJtWpA4ppNJmb/IMbrXeuvtc99Y99
 tbxgA4GYlo+rSqfIZc/drB7CCWdoKKPxt2KNoFBlNUi1hZ8iQJaj0teM6DLlJoDf
 cgPibNn5vieMge3ZYHr8tW10qVIHm6KLxURqQrZMuDyrfOEts0vSlUr8ompJ0tMi
 mXOVSk81udR4NvFDkfGgWxmkAcCipKD7CmQHgUm1tH1vsjgNHeGc70ZWzeQR5dur
 sVBYwS7dTdXWWkXBhPGjdrv+QlYGqPIy+Vs5R5YSR+QHT9qY9BXNSEtoaKFKqxu1
 xNk833z4rxqHh5a/TzcJ1ZullhxmC0n1OAvpaHzqqxtUR5znDkiNskkTIHqnrm4L
 uSqB3fKgCvzDP1bCqTSNFcd3lmyi7is7UsA9U8jkIPWM4RC0LCOJKNOaUN0HiSl9
 qkhHE5Mp/ipSm+vo1quVqrtHMg4IoYQgD6NcQ6NzL1ONJe/DKs/kEdsMk+qwHl4U
 pbrCWpKdapf1DZuwBioBM4qh/CoCvGYeva1+3nXFbRX9VSEWa+PDr1HZ2qynu4RA
 5qvWkFdHXusIDcjC5g8=
 =JuG5
 -----END PGP SIGNATURE-----

Merge tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux into next/drivers

This pxa update brings only a single patch, finishing the
dmaengine conversion.

* tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux:
  dmaengine: pxa: make the filter function internal

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-12-12 13:26:49 -08:00
commit 330a7809cf
2 changed files with 2 additions and 14 deletions

View file

@ -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);

View file

@ -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_ */