Skip to content

Commit cdf27f3

Browse files
pmundtbroonie
authored andcommitted
ASoC: fsi: update for dmaengine prep_slave_sg fallout.
Leading up to the ->device_prep_slave_sg change in 185ecb5 'dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic' a generic wrapper was added in place to guard against the API change, though the fsi driver wasn't updated in the process (presumably its dmaengine support hadn't been merged yet at the time). This trivially switches over to the new wrapper and gets it building again. Signed-off-by: Paul Mundt <[email protected]> Acked-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent a7dbb60 commit cdf27f3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

sound/soc/sh/fsi.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data)
10011001
sg_dma_address(&sg) = buf;
10021002
sg_dma_len(&sg) = len;
10031003

1004-
desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir,
1005-
DMA_PREP_INTERRUPT |
1006-
DMA_CTRL_ACK);
1004+
desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir,
1005+
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
10071006
if (!desc) {
1008-
dev_err(dai->dev, "device_prep_slave_sg() fail\n");
1007+
dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n");
10091008
return;
10101009
}
10111010

0 commit comments

Comments
 (0)