diff options
-rw-r--r-- | drivers/dma/amba-pl08x.c | 20 | ||||
-rw-r--r-- | include/linux/amba/pl08x.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index fb469dedcdf3..433b9e747f75 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
@@ -348,9 +348,9 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan) | |||
348 | } | 348 | } |
349 | 349 | ||
350 | /* Sum up all queued transactions */ | 350 | /* Sum up all queued transactions */ |
351 | if (!list_empty(&plchan->desc_list)) { | 351 | if (!list_empty(&plchan->pend_list)) { |
352 | struct pl08x_txd *txdi; | 352 | struct pl08x_txd *txdi; |
353 | list_for_each_entry(txdi, &plchan->desc_list, node) { | 353 | list_for_each_entry(txdi, &plchan->pend_list, node) { |
354 | bytes += txdi->len; | 354 | bytes += txdi->len; |
355 | } | 355 | } |
356 | } | 356 | } |
@@ -880,9 +880,9 @@ static void pl08x_free_txd_list(struct pl08x_driver_data *pl08x, | |||
880 | struct pl08x_txd *txdi = NULL; | 880 | struct pl08x_txd *txdi = NULL; |
881 | struct pl08x_txd *next; | 881 | struct pl08x_txd *next; |
882 | 882 | ||
883 | if (!list_empty(&plchan->desc_list)) { | 883 | if (!list_empty(&plchan->pend_list)) { |
884 | list_for_each_entry_safe(txdi, | 884 | list_for_each_entry_safe(txdi, |
885 | next, &plchan->desc_list, node) { | 885 | next, &plchan->pend_list, node) { |
886 | list_del(&txdi->node); | 886 | list_del(&txdi->node); |
887 | pl08x_free_txd(pl08x, txdi); | 887 | pl08x_free_txd(pl08x, txdi); |
888 | } | 888 | } |
@@ -1183,10 +1183,10 @@ static void pl08x_issue_pending(struct dma_chan *chan) | |||
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | /* Take the first element in the queue and execute it */ | 1185 | /* Take the first element in the queue and execute it */ |
1186 | if (!list_empty(&plchan->desc_list)) { | 1186 | if (!list_empty(&plchan->pend_list)) { |
1187 | struct pl08x_txd *next; | 1187 | struct pl08x_txd *next; |
1188 | 1188 | ||
1189 | next = list_first_entry(&plchan->desc_list, | 1189 | next = list_first_entry(&plchan->pend_list, |
1190 | struct pl08x_txd, | 1190 | struct pl08x_txd, |
1191 | node); | 1191 | node); |
1192 | list_del(&next->node); | 1192 | list_del(&next->node); |
@@ -1213,7 +1213,7 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan, | |||
1213 | 1213 | ||
1214 | spin_lock_irqsave(&plchan->lock, plchan->lockflags); | 1214 | spin_lock_irqsave(&plchan->lock, plchan->lockflags); |
1215 | 1215 | ||
1216 | list_add_tail(&txd->node, &plchan->desc_list); | 1216 | list_add_tail(&txd->node, &plchan->pend_list); |
1217 | 1217 | ||
1218 | /* | 1218 | /* |
1219 | * See if we already have a physical channel allocated, | 1219 | * See if we already have a physical channel allocated, |
@@ -1571,10 +1571,10 @@ static void pl08x_tasklet(unsigned long data) | |||
1571 | * If a new descriptor is queued, set it up | 1571 | * If a new descriptor is queued, set it up |
1572 | * plchan->at is NULL here | 1572 | * plchan->at is NULL here |
1573 | */ | 1573 | */ |
1574 | if (!list_empty(&plchan->desc_list)) { | 1574 | if (!list_empty(&plchan->pend_list)) { |
1575 | struct pl08x_txd *next; | 1575 | struct pl08x_txd *next; |
1576 | 1576 | ||
1577 | next = list_first_entry(&plchan->desc_list, | 1577 | next = list_first_entry(&plchan->pend_list, |
1578 | struct pl08x_txd, | 1578 | struct pl08x_txd, |
1579 | node); | 1579 | node); |
1580 | list_del(&next->node); | 1580 | list_del(&next->node); |
@@ -1736,7 +1736,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x, | |||
1736 | chan->lc = 0; | 1736 | chan->lc = 0; |
1737 | 1737 | ||
1738 | spin_lock_init(&chan->lock); | 1738 | spin_lock_init(&chan->lock); |
1739 | INIT_LIST_HEAD(&chan->desc_list); | 1739 | INIT_LIST_HEAD(&chan->pend_list); |
1740 | tasklet_init(&chan->tasklet, pl08x_tasklet, | 1740 | tasklet_init(&chan->tasklet, pl08x_tasklet, |
1741 | (unsigned long) chan); | 1741 | (unsigned long) chan); |
1742 | 1742 | ||
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 4e9e71860e1c..08a9024e2d2f 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h | |||
@@ -158,7 +158,7 @@ enum pl08x_dma_chan_state { | |||
158 | * @runtime_direction: current direction of this channel according to | 158 | * @runtime_direction: current direction of this channel according to |
159 | * runtime config | 159 | * runtime config |
160 | * @lc: last completed transaction on this channel | 160 | * @lc: last completed transaction on this channel |
161 | * @desc_list: queued transactions pending on this channel | 161 | * @pend_list: queued transactions pending on this channel |
162 | * @at: active transaction on this channel | 162 | * @at: active transaction on this channel |
163 | * @lockflags: sometimes we let a lock last between two function calls, | 163 | * @lockflags: sometimes we let a lock last between two function calls, |
164 | * especially prep/submit, and then we need to store the IRQ flags | 164 | * especially prep/submit, and then we need to store the IRQ flags |
@@ -179,7 +179,7 @@ struct pl08x_dma_chan { | |||
179 | dma_addr_t runtime_addr; | 179 | dma_addr_t runtime_addr; |
180 | enum dma_data_direction runtime_direction; | 180 | enum dma_data_direction runtime_direction; |
181 | dma_cookie_t lc; | 181 | dma_cookie_t lc; |
182 | struct list_head desc_list; | 182 | struct list_head pend_list; |
183 | struct pl08x_txd *at; | 183 | struct pl08x_txd *at; |
184 | unsigned long lockflags; | 184 | unsigned long lockflags; |
185 | spinlock_t lock; | 185 | spinlock_t lock; |