瀏覽代碼

ASoC: rsnd: rsnd_src_ssiu_stop() stops SSIU compulsorily

rsnd_src_ssiu_stop() is used to stop SSIU,
but it shouldn't depend on whether it is using SSIU.
This patch stops SSIU compulsorily.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Kuninori Morimoto 10 年之前
父節點
當前提交
660cdce2fb
共有 3 個文件被更改,包括 5 次插入8 次删除
  1. 1 2
      sound/soc/sh/rcar/rsnd.h
  2. 2 4
      sound/soc/sh/rcar/src.c
  3. 2 2
      sound/soc/sh/rcar/ssi.c

+ 1 - 2
sound/soc/sh/rcar/rsnd.h

@@ -431,8 +431,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
 			struct rsnd_dai *rdai,
 			int use_busif);
 int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
-		       struct rsnd_dai *rdai,
-		       int use_busif);
+		       struct rsnd_dai *rdai);
 int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
 			    struct rsnd_dai *rdai);
 

+ 2 - 4
sound/soc/sh/rcar/src.c

@@ -175,14 +175,12 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
 }
 
 int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
-			struct rsnd_dai *rdai,
-			int use_busif)
+		       struct rsnd_dai *rdai)
 {
 	/*
 	 * DMA settings for SSIU
 	 */
-	if (use_busif)
-		rsnd_mod_write(ssi_mod, SSI_CTRL, 0);
+	rsnd_mod_write(ssi_mod, SSI_CTRL, 0);
 
 	return 0;
 }

+ 2 - 2
sound/soc/sh/rcar/ssi.c

@@ -424,7 +424,7 @@ static int rsnd_ssi_pio_stop(struct rsnd_mod *mod,
 
 	rsnd_ssi_hw_stop(ssi, rdai);
 
-	rsnd_src_ssiu_stop(mod, rdai, 0);
+	rsnd_src_ssiu_stop(mod, rdai);
 
 	return 0;
 }
@@ -528,7 +528,7 @@ static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
 
 	rsnd_dma_stop(dma);
 
-	rsnd_src_ssiu_stop(mod, rdai, 1);
+	rsnd_src_ssiu_stop(mod, rdai);
 
 	return 0;
 }