| From ecdd264f4c8a0887884cf96f36158742b01d3fb3 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 3 Mar 2014 20:51:11 -0800 |
| Subject: 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> |
| (cherry picked from commit 9524be0e761edd9f3c020344677d914ed249d010) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/adg.c | 5 ----- |
| sound/soc/sh/rcar/core.c | 14 -------------- |
| sound/soc/sh/rcar/gen.c | 5 ----- |
| sound/soc/sh/rcar/rsnd.h | 8 -------- |
| sound/soc/sh/rcar/scu.c | 5 ----- |
| sound/soc/sh/rcar/ssi.c | 5 ----- |
| 6 files changed, 42 deletions(-) |
| |
| --- a/sound/soc/sh/rcar/adg.c |
| +++ b/sound/soc/sh/rcar/adg.c |
| @@ -454,8 +454,3 @@ int rsnd_adg_probe(struct platform_devic |
| |
| return 0; |
| } |
| - |
| -void rsnd_adg_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv) |
| -{ |
| -} |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -708,11 +708,6 @@ static int rsnd_dai_probe(struct platfor |
| return 0; |
| } |
| |
| -static void rsnd_dai_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv) |
| -{ |
| -} |
| - |
| /* |
| * pcm ops |
| */ |
| @@ -901,15 +896,6 @@ static int rsnd_remove(struct platform_d |
| return ret; |
| } |
| |
| - /* |
| - * remove each module |
| - */ |
| - rsnd_ssi_remove(pdev, priv); |
| - rsnd_adg_remove(pdev, priv); |
| - rsnd_scu_remove(pdev, priv); |
| - rsnd_dai_remove(pdev, priv); |
| - rsnd_gen_remove(pdev, priv); |
| - |
| return 0; |
| } |
| |
| --- a/sound/soc/sh/rcar/gen.c |
| +++ b/sound/soc/sh/rcar/gen.c |
| @@ -385,8 +385,3 @@ int rsnd_gen_probe(struct platform_devic |
| |
| return ret; |
| } |
| - |
| -void rsnd_gen_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv) |
| -{ |
| -} |
| --- 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_ |
| */ |
| int rsnd_gen_probe(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| -void rsnd_gen_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv); |
| void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, |
| struct rsnd_mod *mod, |
| enum rsnd_reg reg); |
| @@ -276,8 +274,6 @@ int rsnd_adg_ssi_clk_stop(struct rsnd_mo |
| int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); |
| int rsnd_adg_probe(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| -void rsnd_adg_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv); |
| int rsnd_adg_set_convert_clk_gen1(struct rsnd_priv *priv, |
| struct rsnd_mod *mod, |
| unsigned int src_rate, |
| @@ -353,8 +349,6 @@ struct rsnd_priv { |
| */ |
| int rsnd_scu_probe(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| -void rsnd_scu_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv); |
| struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id); |
| unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, |
| struct rsnd_dai_stream *io, |
| @@ -373,8 +367,6 @@ int rsnd_scu_enable_ssi_irq(struct rsnd_ |
| */ |
| int rsnd_ssi_probe(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| -void rsnd_ssi_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv); |
| struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); |
| struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv, |
| int dai_id, int is_play); |
| --- a/sound/soc/sh/rcar/scu.c |
| +++ b/sound/soc/sh/rcar/scu.c |
| @@ -680,8 +680,3 @@ int rsnd_scu_probe(struct platform_devic |
| |
| return 0; |
| } |
| - |
| -void rsnd_scu_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv) |
| -{ |
| -} |
| --- a/sound/soc/sh/rcar/ssi.c |
| +++ b/sound/soc/sh/rcar/ssi.c |
| @@ -638,8 +638,3 @@ int rsnd_ssi_probe(struct platform_devic |
| |
| return 0; |
| } |
| - |
| -void rsnd_ssi_remove(struct platform_device *pdev, |
| - struct rsnd_priv *priv) |
| -{ |
| -} |