diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 20:09:18 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 20:09:18 +0530 |
| commit | 2325a6a0b52ba106f44ee16bc60108b4d9b0e719 (patch) | |
| tree | 44d769a97adc82f6648b4c401066cf7d56fc8709 | |
| parent | 1d069bfa3c78c6d0285e5e370710cf7062c71308 (diff) | |
| parent | 192dc8c07594c43b6d58242b6bb2db742e3421c0 (diff) | |
| download | linux-2325a6a0b52ba106f44ee16bc60108b4d9b0e719.tar.bz2 | |
Merge branch 'topic/at_xdmac' into for-linus
| -rw-r--r-- | drivers/dma/at_xdmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index e4c5522f9dcd..0d5c7ce43e0e 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -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) { |