aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/at_hdmac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma/at_hdmac.c')
-rw-r--r--drivers/dma/at_hdmac.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 7585c4164bd5..278cf5bceef2 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -22,6 +22,7 @@
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <linux/module.h> 23#include <linux/module.h>
24#include <linux/platform_device.h> 24#include <linux/platform_device.h>
25#include <linux/slab.h>
25 26
26#include "at_hdmac_regs.h" 27#include "at_hdmac_regs.h"
27 28
@@ -99,7 +100,7 @@ static struct at_desc *atc_alloc_descriptor(struct dma_chan *chan,
99} 100}
100 101
101/** 102/**
102 * atc_desc_get - get a unsused descriptor from free_list 103 * atc_desc_get - get an unused descriptor from free_list
103 * @atchan: channel we want a new descriptor for 104 * @atchan: channel we want a new descriptor for
104 */ 105 */
105static struct at_desc *atc_desc_get(struct at_dma_chan *atchan) 106static struct at_desc *atc_desc_get(struct at_dma_chan *atchan)
@@ -815,7 +816,7 @@ atc_is_tx_complete(struct dma_chan *chan,
815 dev_vdbg(chan2dev(chan), "is_tx_complete: %d (d%d, u%d)\n", 816 dev_vdbg(chan2dev(chan), "is_tx_complete: %d (d%d, u%d)\n",
816 cookie, done ? *done : 0, used ? *used : 0); 817 cookie, done ? *done : 0, used ? *used : 0);
817 818
818 spin_lock_bh(atchan->lock); 819 spin_lock_bh(&atchan->lock);
819 820
820 last_complete = atchan->completed_cookie; 821 last_complete = atchan->completed_cookie;
821 last_used = chan->cookie; 822 last_used = chan->cookie;
@@ -830,7 +831,7 @@ atc_is_tx_complete(struct dma_chan *chan,
830 ret = dma_async_is_complete(cookie, last_complete, last_used); 831 ret = dma_async_is_complete(cookie, last_complete, last_used);
831 } 832 }
832 833
833 spin_unlock_bh(atchan->lock); 834 spin_unlock_bh(&atchan->lock);
834 835
835 if (done) 836 if (done)
836 *done = last_complete; 837 *done = last_complete;
@@ -1188,7 +1189,7 @@ static int at_dma_resume_noirq(struct device *dev)
1188 return 0; 1189 return 0;
1189} 1190}
1190 1191
1191static struct dev_pm_ops at_dma_dev_pm_ops = { 1192static const struct dev_pm_ops at_dma_dev_pm_ops = {
1192 .suspend_noirq = at_dma_suspend_noirq, 1193 .suspend_noirq = at_dma_suspend_noirq,
1193 .resume_noirq = at_dma_resume_noirq, 1194 .resume_noirq = at_dma_resume_noirq,
1194}; 1195};