diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-15 08:57:44 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 09:58:58 -0500 |
commit | 98817b99599fc18b5e4bf5bc63ad899b83404a68 (patch) | |
tree | 5a95c5af7d19946e47525f88591907e42d9e010e /drivers/dma/mv_xor.c | |
parent | ecde6cd4924205e815adf8f1b0df98965e804e7f (diff) |
dma: mv_xor: in mv_xor_chan, rename 'common' to 'dmachan'
The mv_xor_chan structure embeds a 'struct dma_chan', which is named
'common', a not very meaningful name. Rename it to 'dmachan', which
will help avoid confusions later as we merge the mv_xor_device and
mv_xor_chan structures together.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'drivers/dma/mv_xor.c')
-rw-r--r-- | drivers/dma/mv_xor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 6e705ea001da..491f506b798b 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
@@ -34,7 +34,7 @@ | |||
34 | static void mv_xor_issue_pending(struct dma_chan *chan); | 34 | static void mv_xor_issue_pending(struct dma_chan *chan); |
35 | 35 | ||
36 | #define to_mv_xor_chan(chan) \ | 36 | #define to_mv_xor_chan(chan) \ |
37 | container_of(chan, struct mv_xor_chan, common) | 37 | container_of(chan, struct mv_xor_chan, dmachan) |
38 | 38 | ||
39 | #define to_mv_xor_slot(tx) \ | 39 | #define to_mv_xor_slot(tx) \ |
40 | container_of(tx, struct mv_xor_desc_slot, async_tx) | 40 | container_of(tx, struct mv_xor_desc_slot, async_tx) |
@@ -284,7 +284,7 @@ static void mv_xor_start_new_chain(struct mv_xor_chan *mv_chan, | |||
284 | mv_chan_set_next_descriptor(mv_chan, sw_desc->async_tx.phys); | 284 | mv_chan_set_next_descriptor(mv_chan, sw_desc->async_tx.phys); |
285 | } | 285 | } |
286 | mv_chan->pending += sw_desc->slot_cnt; | 286 | mv_chan->pending += sw_desc->slot_cnt; |
287 | mv_xor_issue_pending(&mv_chan->common); | 287 | mv_xor_issue_pending(&mv_chan->dmachan); |
288 | } | 288 | } |
289 | 289 | ||
290 | static dma_cookie_t | 290 | static dma_cookie_t |
@@ -437,7 +437,7 @@ static void __mv_xor_slot_cleanup(struct mv_xor_chan *mv_chan) | |||
437 | } | 437 | } |
438 | 438 | ||
439 | if (cookie > 0) | 439 | if (cookie > 0) |
440 | mv_chan->common.completed_cookie = cookie; | 440 | mv_chan->dmachan.completed_cookie = cookie; |
441 | } | 441 | } |
442 | 442 | ||
443 | static void | 443 | static void |
@@ -1177,10 +1177,10 @@ mv_xor_channel_add(struct mv_xor_private *msp, | |||
1177 | INIT_LIST_HEAD(&mv_chan->chain); | 1177 | INIT_LIST_HEAD(&mv_chan->chain); |
1178 | INIT_LIST_HEAD(&mv_chan->completed_slots); | 1178 | INIT_LIST_HEAD(&mv_chan->completed_slots); |
1179 | INIT_LIST_HEAD(&mv_chan->all_slots); | 1179 | INIT_LIST_HEAD(&mv_chan->all_slots); |
1180 | mv_chan->common.device = dma_dev; | 1180 | mv_chan->dmachan.device = dma_dev; |
1181 | dma_cookie_init(&mv_chan->common); | 1181 | dma_cookie_init(&mv_chan->dmachan); |
1182 | 1182 | ||
1183 | list_add_tail(&mv_chan->common.device_node, &dma_dev->channels); | 1183 | list_add_tail(&mv_chan->dmachan.device_node, &dma_dev->channels); |
1184 | 1184 | ||
1185 | if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) { | 1185 | if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) { |
1186 | ret = mv_xor_memcpy_self_test(adev); | 1186 | ret = mv_xor_memcpy_self_test(adev); |