mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
Merge branch 'topic/at_xdmac' into for-linus
This commit is contained in:
commit
2325a6a0b5
1 changed files with 2 additions and 2 deletions
|
@ -456,7 +456,7 @@ static struct at_xdmac_desc *at_xdmac_alloc_desc(struct dma_chan *chan,
|
|||
return desc;
|
||||
}
|
||||
|
||||
void at_xdmac_init_used_desc(struct at_xdmac_desc *desc)
|
||||
static void at_xdmac_init_used_desc(struct at_xdmac_desc *desc)
|
||||
{
|
||||
memset(&desc->lld, 0, sizeof(desc->lld));
|
||||
INIT_LIST_HEAD(&desc->descs_list);
|
||||
|
@ -1202,7 +1202,7 @@ static struct at_xdmac_desc *at_xdmac_memset_create_desc(struct dma_chan *chan,
|
|||
return desc;
|
||||
}
|
||||
|
||||
struct dma_async_tx_descriptor *
|
||||
static struct dma_async_tx_descriptor *
|
||||
at_xdmac_prep_dma_memset(struct dma_chan *chan, dma_addr_t dest, int value,
|
||||
size_t len, unsigned long flags)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue