--- v2
+++ v3
@@ -9,10 +9,10 @@
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
-index 851993c..06421c0 100644
+index 82b8e9f..5da1a4a 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
-@@ -84,7 +84,7 @@ static void set_desc_cnt(struct fsldma_chan *chan,
+@@ -89,7 +89,7 @@ static void set_desc_cnt(struct fsldma_chan *chan,
}
static void set_desc_src(struct fsldma_chan *chan,
@@ -21,7 +21,7 @@
{
u64 snoop_bits;
-@@ -94,7 +94,7 @@ static void set_desc_src(struct fsldma_chan *chan,
+@@ -99,7 +99,7 @@ static void set_desc_src(struct fsldma_chan *chan,
}
static void set_desc_dst(struct fsldma_chan *chan,
@@ -30,7 +30,7 @@
{
u64 snoop_bits;
-@@ -104,7 +104,7 @@ static void set_desc_dst(struct fsldma_chan *chan,
+@@ -109,7 +109,7 @@ static void set_desc_dst(struct fsldma_chan *chan,
}
static void set_desc_next(struct fsldma_chan *chan,
@@ -39,7 +39,7 @@
{
u64 snoop_bits;
-@@ -113,8 +113,7 @@ static void set_desc_next(struct fsldma_chan *chan,
+@@ -118,8 +118,7 @@ static void set_desc_next(struct fsldma_chan *chan,
hw->next_ln_addr = CPU_TO_DMA(chan, snoop_bits | next, 64);
}
@@ -49,7 +49,7 @@
{
u64 snoop_bits;
-@@ -333,8 +332,7 @@ static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
+@@ -338,8 +337,7 @@ static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
chan->feature &= ~FSL_DMA_CHAN_START_EXT;
}
@@ -59,7 +59,7 @@
{
struct fsl_desc_sw *tail = to_fsl_desc(chan->ld_pending.prev);
-@@ -375,8 +373,8 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+@@ -380,8 +378,8 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
cookie = chan->common.cookie;
list_for_each_entry(child, &desc->tx_list, node) {
cookie++;
@@ -70,7 +70,7 @@
child->async_tx.cookie = cookie;
}
-@@ -397,8 +395,7 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+@@ -402,8 +400,7 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
*
* Return - The descriptor allocated. NULL for failed.
*/
@@ -78,9 +78,9 @@
- struct fsldma_chan *chan)
+static struct fsl_desc_sw *fsl_dma_alloc_descriptor(struct fsldma_chan *chan)
{
- const char *name = chan->name;
struct fsl_desc_sw *desc;
-@@ -423,7 +420,6 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+ dma_addr_t pdesc;
+@@ -427,7 +424,6 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
return desc;
}
@@ -88,7 +88,7 @@
/**
* fsl_dma_alloc_chan_resources - Allocate resources for DMA channel.
* @chan : Freescale DMA channel
-@@ -534,14 +530,15 @@ fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
+@@ -537,14 +533,15 @@ fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
/* Insert the link descriptor to the LD ring */
list_add_tail(&new->node, &new->tx_list);
@@ -107,7 +107,7 @@
size_t len, unsigned long flags)
{
struct fsldma_chan *chan;
-@@ -591,7 +588,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+@@ -594,7 +591,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
new->async_tx.flags = flags; /* client is in control of this ack */
new->async_tx.cookie = -EBUSY;