aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-03 23:51:11 -0500
committerMark Brown <broonie@linaro.org>2014-03-05 01:07:53 -0500
commit9524be0e761edd9f3c020344677d914ed249d010 (patch)
tree0fd5989ae27ea61b9ab6d818ce0b30d248da6ae4
parent4076220767416b8b65009dd57eeb317c38d41baa (diff)
ASoC: rsnd: remove all rsnd_xxx_remove()
Now, rsnd_xxx_remove() do nothing. remove these Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/sh/rcar/adg.c5
-rw-r--r--sound/soc/sh/rcar/core.c14
-rw-r--r--sound/soc/sh/rcar/gen.c5
-rw-r--r--sound/soc/sh/rcar/rsnd.h8
-rw-r--r--sound/soc/sh/rcar/scu.c5
-rw-r--r--sound/soc/sh/rcar/ssi.c5
6 files changed, 0 insertions, 42 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 8df00ac3b120..953f1cce982d 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -454,8 +454,3 @@ int rsnd_adg_probe(struct platform_device *pdev,
454 454
455 return 0; 455 return 0;
456} 456}
457
458void rsnd_adg_remove(struct platform_device *pdev,
459 struct rsnd_priv *priv)
460{
461}
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 92e155b7b6a7..ceb4e8bd4970 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -708,11 +708,6 @@ static int rsnd_dai_probe(struct platform_device *pdev,
708 return 0; 708 return 0;
709} 709}
710 710
711static void rsnd_dai_remove(struct platform_device *pdev,
712 struct rsnd_priv *priv)
713{
714}
715
716/* 711/*
717 * pcm ops 712 * pcm ops
718 */ 713 */
@@ -902,15 +897,6 @@ static int rsnd_remove(struct platform_device *pdev)
902 return ret; 897 return ret;
903 } 898 }
904 899
905 /*
906 * remove each module
907 */
908 rsnd_ssi_remove(pdev, priv);
909 rsnd_adg_remove(pdev, priv);
910 rsnd_scu_remove(pdev, priv);
911 rsnd_dai_remove(pdev, priv);
912 rsnd_gen_remove(pdev, priv);
913
914 return 0; 900 return 0;
915} 901}
916 902
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 92d1bc9acef0..9094970dbdfb 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -385,8 +385,3 @@ int rsnd_gen_probe(struct platform_device *pdev,
385 385
386 return ret; 386 return ret;
387} 387}
388
389void rsnd_gen_remove(struct platform_device *pdev,
390 struct rsnd_priv *priv)
391{
392}
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index db20b3721953..878dc6e20ff2 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -261,8 +261,6 @@ int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);
261 */ 261 */
262int rsnd_gen_probe(struct platform_device *pdev, 262int rsnd_gen_probe(struct platform_device *pdev,
263 struct rsnd_priv *priv); 263 struct rsnd_priv *priv);
264void rsnd_gen_remove(struct platform_device *pdev,
265 struct rsnd_priv *priv);
266void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, 264void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
267 struct rsnd_mod *mod, 265 struct rsnd_mod *mod,
268 enum rsnd_reg reg); 266 enum rsnd_reg reg);
@@ -276,8 +274,6 @@ int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod);
276int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); 274int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate);
277int rsnd_adg_probe(struct platform_device *pdev, 275int rsnd_adg_probe(struct platform_device *pdev,
278 struct rsnd_priv *priv); 276 struct rsnd_priv *priv);
279void rsnd_adg_remove(struct platform_device *pdev,
280 struct rsnd_priv *priv);
281int rsnd_adg_set_convert_clk_gen1(struct rsnd_priv *priv, 277int rsnd_adg_set_convert_clk_gen1(struct rsnd_priv *priv,
282 struct rsnd_mod *mod, 278 struct rsnd_mod *mod,
283 unsigned int src_rate, 279 unsigned int src_rate,
@@ -353,8 +349,6 @@ struct rsnd_priv {
353 */ 349 */
354int rsnd_scu_probe(struct platform_device *pdev, 350int rsnd_scu_probe(struct platform_device *pdev,
355 struct rsnd_priv *priv); 351 struct rsnd_priv *priv);
356void rsnd_scu_remove(struct platform_device *pdev,
357 struct rsnd_priv *priv);
358struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id); 352struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id);
359unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, 353unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv,
360 struct rsnd_dai_stream *io, 354 struct rsnd_dai_stream *io,
@@ -373,8 +367,6 @@ int rsnd_scu_enable_ssi_irq(struct rsnd_mod *ssi_mod,
373 */ 367 */
374int rsnd_ssi_probe(struct platform_device *pdev, 368int rsnd_ssi_probe(struct platform_device *pdev,
375 struct rsnd_priv *priv); 369 struct rsnd_priv *priv);
376void rsnd_ssi_remove(struct platform_device *pdev,
377 struct rsnd_priv *priv);
378struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); 370struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
379struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv, 371struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
380 int dai_id, int is_play); 372 int dai_id, int is_play);
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 40250acf608d..3526a5c2f608 100644
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -680,8 +680,3 @@ int rsnd_scu_probe(struct platform_device *pdev,
680 680
681 return 0; 681 return 0;
682} 682}
683
684void rsnd_scu_remove(struct platform_device *pdev,
685 struct rsnd_priv *priv)
686{
687}
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 0f3eeac56155..45f828ded935 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -638,8 +638,3 @@ int rsnd_ssi_probe(struct platform_device *pdev,
638 638
639 return 0; 639 return 0;
640} 640}
641
642void rsnd_ssi_remove(struct platform_device *pdev,
643 struct rsnd_priv *priv)
644{
645}