diff options
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/fsi.c | 7 | ||||
-rw-r--r-- | sound/soc/sh/migor.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 378cc5b056d7..74ed2dffbffd 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data) | |||
1001 | sg_dma_address(&sg) = buf; | 1001 | sg_dma_address(&sg) = buf; |
1002 | sg_dma_len(&sg) = len; | 1002 | sg_dma_len(&sg) = len; |
1003 | 1003 | ||
1004 | desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir, | 1004 | desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir, |
1005 | DMA_PREP_INTERRUPT | | 1005 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
1006 | DMA_CTRL_ACK); | ||
1007 | if (!desc) { | 1006 | if (!desc) { |
1008 | dev_err(dai->dev, "device_prep_slave_sg() fail\n"); | 1007 | dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n"); |
1009 | return; | 1008 | return; |
1010 | } | 1009 | } |
1011 | 1010 | ||
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 9d9ad8d61c0a..8526e1edaf45 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c | |||
@@ -35,7 +35,7 @@ static unsigned long siumckb_recalc(struct clk *clk) | |||
35 | return codec_freq; | 35 | return codec_freq; |
36 | } | 36 | } |
37 | 37 | ||
38 | static struct clk_ops siumckb_clk_ops = { | 38 | static struct sh_clk_ops siumckb_clk_ops = { |
39 | .recalc = siumckb_recalc, | 39 | .recalc = siumckb_recalc, |
40 | }; | 40 | }; |
41 | 41 | ||