iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: fix for cookie changes and merge

Browse Source 
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>
This commit is contained in:
Vinod Koul 2012-03-13 11:58:12 +05:30
parent 8867bd508f
commit 949ff5b8d4
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/dma/imx-sdma.c
View File

@ -1127,6 +1127,7 @@ static void sdma_issue_pending(struct dma_chan *chan)
struct sdma_engine *sdma = sdmac->sdma; struct sdma_engine *sdma = sdmac->sdma;
if (sdmac->status == DMA_IN_PROGRESS) if (sdmac->status == DMA_IN_PROGRESS)
sdma_enable_channel(sdma, sdmac->channel);
} }
#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34

1
drivers/dma/intel_mid_dma.c
View File

@ -477,6 +477,7 @@ static enum dma_status intel_mid_dma_tx_status(struct dma_chan *chan,
dma_cookie_t cookie, dma_cookie_t cookie,
struct dma_tx_state *txstate) struct dma_tx_state *txstate)
{ {
struct intel_mid_dma_chan *midc = to_intel_mid_dma_chan(chan);
enum dma_status ret; enum dma_status ret;
ret = dma_cookie_status(chan, cookie, txstate); ret = dma_cookie_status(chan, cookie, txstate);

1
drivers/dma/ioat/dma_v3.c
View File

@ -61,6 +61,7 @@
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include "../dmaengine.h"
#include "registers.h" #include "registers.h"
#include "hw.h" #include "hw.h"
#include "dma.h" #include "dma.h"

1
drivers/dma/iop-adma.c
View File

@ -894,6 +894,7 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
struct dma_tx_state *txstate) struct dma_tx_state *txstate)
{ {
struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan); struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);
int ret;
ret = dma_cookie_status(chan, cookie, txstate); ret = dma_cookie_status(chan, cookie, txstate);
if (ret == DMA_SUCCESS) if (ret == DMA_SUCCESS)

2
drivers/dma/sirf-dma.c
View File

@ -18,6 +18,8 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/sirfsoc_dma.h> #include <linux/sirfsoc_dma.h>
#include "dmaengine.h"
#define SIRFSOC_DMA_DESCRIPTORS 16 #define SIRFSOC_DMA_DESCRIPTORS 16
#define SIRFSOC_DMA_CHANNELS 16 #define SIRFSOC_DMA_CHANNELS 16

6
drivers/dma/timb_dma.c
View File

@ -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, static enum dma_status td_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
struct dma_tx_state *txstate) struct dma_tx_state *txstate)
{ {
struct timb_dma_chan *td_chan =
container_of(chan, struct timb_dma_chan, chan);
enum dma_status ret; enum dma_status ret;
dev_dbg(chan2dev(chan), "%s: Entry\n", __func__); dev_dbg(chan2dev(chan), "%s: Entry\n", __func__);
ret = dma_cookie_status(chan, cookie, txstate); ret = dma_cookie_status(chan, cookie, txstate);
dev_dbg(chan2dev(chan), dev_dbg(chan2dev(chan), "%s: exit, ret: %d\n", __func__, ret);
"%s: exit, ret: %d, last_complete: %d, last_used: %d\n",
__func__, ret, last_complete, last_used);
return ret; return ret;
} }