Merge pull request torvalds#38 from aejsmith/ci20-v3.18-dma

ZubairLK · ZubairLK · commit a1655e7a8bfd · 2015-06-29T10:38:30.000+01:00
dmaengine: jz4780: Fix jz4780_dma_prep_dma_cyclic prototype
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
@@ -333,7 +333,7 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_slave_sg(
 static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic(
 	struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
 	size_t period_len, enum dma_transfer_direction direction,
-	unsigned long flags, void *context)
+	unsigned long flags)
 {
 	struct jz4780_dma_chan *jzchan = to_jz4780_dma_chan(chan);
 	struct jz4780_dma_desc *desc;

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_slave_sg(`
`333`	`333`	`static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic(`
`334`	`334`	`struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,`
`335`	`335`	`size_t period_len, enum dma_transfer_direction direction,`
`336`		`- unsigned long flags, void *context)`
	`336`	`+ unsigned long flags)`
`337`	`337`	`{`
`338`	`338`	`struct jz4780_dma_chan *jzchan = to_jz4780_dma_chan(chan);`
`339`	`339`	`struct jz4780_dma_desc *desc;`