dmaengine: fix for cookie changes and merge

Fixed trivial issues in drivers:
	drivers/dma/imx-sdma.c
	drivers/dma/intel_mid_dma.c
	drivers/dma/ioat/dma_v3.c
	drivers/dma/iop-adma.c
	drivers/dma/sirf-dma.c
	drivers/dma/timb_dma.c

Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index ccfc7c425c525b37227ed320ab9b35d5bc3acac7..81f9d57ec70f614ff0928643e5d1d548f46a97ec 100644 (file)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1127,6 +1127,7 @@ static void sdma_issue_pending(struct dma_chan *chan)
        struct sdma_engine *sdma = sdmac->sdma;
 
        if (sdmac->status == DMA_IN_PROGRESS)
+               sdma_enable_channel(sdma, sdmac->channel);
 }
 
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1        34

diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index d599d96a57b64690f5b6f9bcfdd299652c48f85f..2449812f54642062ff9c5602c662f1d5faa35c21 100644 (file)
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -477,6 +477,7 @@ static enum dma_status intel_mid_dma_tx_status(struct dma_chan *chan,
                                                dma_cookie_t cookie,
                                                struct dma_tx_state *txstate)
 {
+       struct intel_mid_dma_chan *midc = to_intel_mid_dma_chan(chan);
        enum dma_status ret;
 
        ret = dma_cookie_status(chan, cookie, txstate);

diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index 145eda241dee5c01ee9f1e1ae8725cf923f2d8f0..2c4476c0e405be9ce3b547b6a0da7cc814eecc07 100644 (file)
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -61,6 +61,7 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/prefetch.h>
+#include "../dmaengine.h"
 #include "registers.h"
 #include "hw.h"
 #include "dma.h"

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 1f3a703ed0e0237d8c0ab9357e746db4e8428f56..4499f88789bceb4c56d6fd20801f17b6d7f5458d 100644 (file)
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -894,6 +894,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
                                        struct dma_tx_state *txstate)
 {
        struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);
+       int ret;
 
        ret = dma_cookie_status(chan, cookie, txstate);
        if (ret == DMA_SUCCESS)

diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index a2cde858523946086fa73c2607be913869866656..45ba352fb871bf44abaf4e713ff92b1595938efa 100644 (file)
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -18,6 +18,8 @@
 #include <linux/of_platform.h>
 #include <linux/sirfsoc_dma.h>
 
+#include "dmaengine.h"
+
 #define SIRFSOC_DMA_DESCRIPTORS                 16
 #define SIRFSOC_DMA_CHANNELS                    16
 

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 7805996661b85b28aa1309b0a352db238a8b62b7..d408c22060231549227aab005f9c543c2ae83d1f 100644 (file)
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -510,17 +510,13 @@ static void td_free_chan_resources(struct dma_chan *chan)
 static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
                                    struct dma_tx_state *txstate)
 {
-       struct timb_dma_chan *td_chan =
-               container_of(chan, struct timb_dma_chan, chan);
        enum dma_status ret;
 
        dev_dbg(chan2dev(chan), "%s: Entry\n", __func__);
 
        ret = dma_cookie_status(chan, cookie, txstate);
 
-       dev_dbg(chan2dev(chan),
-               "%s: exit, ret: %d, last_complete: %d, last_used: %d\n",
-               __func__, ret, last_complete, last_used);
+       dev_dbg(chan2dev(chan), "%s: exit, ret: %d\n",  __func__, ret);
 
        return ret;
 }