Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9d54540147336c75f81c36c342b3bfec0d4d60d

Authored by Russell King
1 parent 1338631433
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: sa11x0: fix build errors from DMA engine API updates 

The recent merge of the sa11x0 code into mainline had silent conflicts
with further development of the DMA engine API, leading to build errors
and warnings:

drivers/net/irda/sa1100_ir.c: In function 'sa1100_irda_dma_start':
drivers/net/irda/sa1100_ir.c:151: error: too few arguments to function 'chan->device->device_prep_slave_sg'
drivers/dma/sa11x0-dma.c: In function 'sa11x0_dma_probe':
drivers/dma/sa11x0-dma.c:950: warning: assignment from incompatible pointer type

Fix these.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/dma/sa11x0-dma.c
Diff comments   View file @ d9d5454
... ... @@ -585,7 +585,7 @@
585 585  
586 586 static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
587 587 struct dma_chan *chan, struct scatterlist *sg, unsigned int sglen,
588   - enum dma_transfer_direction dir, unsigned long flags)
  588 + enum dma_transfer_direction dir, unsigned long flags, void *context)
589 589 {
590 590 struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
591 591 struct sa11x0_dma_desc *txd;
drivers/net/irda/sa1100_ir.c
Diff comments   View file @ d9d5454
... ... @@ -147,7 +147,7 @@
147 147 struct dma_async_tx_descriptor *desc;
148 148 struct dma_chan *chan = buf->chan;
149 149  
150   - desc = chan->device->device_prep_slave_sg(chan, &buf->sg, 1, dir,
  150 + desc = dmaengine_prep_slave_sg(chan, &buf->sg, 1, dir,
151 151 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
152 152 if (desc) {
153 153 desc->callback = cb;