| From d87b0ab780b8d825dff81f88b4dc097c32bf7e11 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 24 Feb 2014 22:15:00 -0800 |
| Subject: ASoC: rsnd: remove verbose function parameter |
| |
| priv has rcar_snd_info pointer. |
| having priv and info in same time is verbose. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit 5da39cf30454bbf3e92f56935e7d137e5bd2c830) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/adg.c | 1 - |
| sound/soc/sh/rcar/core.c | 11 +++++------ |
| sound/soc/sh/rcar/gen.c | 7 ++----- |
| sound/soc/sh/rcar/rsnd.h | 5 +---- |
| sound/soc/sh/rcar/scu.c | 2 +- |
| sound/soc/sh/rcar/ssi.c | 2 +- |
| 6 files changed, 10 insertions(+), 18 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c |
| index af9e4407aa89..69d9394f3697 100644 |
| --- a/sound/soc/sh/rcar/adg.c |
| +++ b/sound/soc/sh/rcar/adg.c |
| @@ -391,7 +391,6 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg) |
| } |
| |
| int rsnd_adg_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| struct rsnd_adg *adg; |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index 5f6d9fef23d1..b2370f68e645 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -577,7 +577,6 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { |
| }; |
| |
| static int rsnd_dai_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| struct snd_soc_dai_driver *drv; |
| @@ -773,23 +772,23 @@ static int rsnd_probe(struct platform_device *pdev) |
| /* |
| * init each module |
| */ |
| - ret = rsnd_gen_probe(pdev, info, priv); |
| + ret = rsnd_gen_probe(pdev, priv); |
| if (ret) |
| return ret; |
| |
| - ret = rsnd_ssi_probe(pdev, info, priv); |
| + ret = rsnd_ssi_probe(pdev, priv); |
| if (ret) |
| return ret; |
| |
| - ret = rsnd_scu_probe(pdev, info, priv); |
| + ret = rsnd_scu_probe(pdev, priv); |
| if (ret) |
| return ret; |
| |
| - ret = rsnd_adg_probe(pdev, info, priv); |
| + ret = rsnd_adg_probe(pdev, priv); |
| if (ret) |
| return ret; |
| |
| - ret = rsnd_dai_probe(pdev, info, priv); |
| + ret = rsnd_dai_probe(pdev, priv); |
| if (ret) |
| return ret; |
| |
| diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c |
| index 0a43b906ffdf..bcb98f4be831 100644 |
| --- a/sound/soc/sh/rcar/gen.c |
| +++ b/sound/soc/sh/rcar/gen.c |
| @@ -276,7 +276,6 @@ static int rsnd_gen2_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen) |
| } |
| |
| static int rsnd_gen2_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| struct device *dev = rsnd_priv_to_dev(priv); |
| @@ -374,7 +373,6 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen) |
| } |
| |
| static int rsnd_gen1_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| struct device *dev = rsnd_priv_to_dev(priv); |
| @@ -419,7 +417,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev, |
| * Gen |
| */ |
| int rsnd_gen_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| struct device *dev = rsnd_priv_to_dev(priv); |
| @@ -436,9 +433,9 @@ int rsnd_gen_probe(struct platform_device *pdev, |
| |
| ret = -ENODEV; |
| if (rsnd_is_gen1(priv)) |
| - ret = rsnd_gen1_probe(pdev, info, priv); |
| + ret = rsnd_gen1_probe(pdev, priv); |
| else if (rsnd_is_gen2(priv)) |
| - ret = rsnd_gen2_probe(pdev, info, priv); |
| + ret = rsnd_gen2_probe(pdev, priv); |
| |
| if (ret < 0) |
| dev_err(dev, "unknown generation R-Car sound device\n"); |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index fb1e0cee08b6..8ac28acc7086 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -226,7 +226,6 @@ int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional); |
| * R-Car Gen1/Gen2 |
| */ |
| int rsnd_gen_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv); |
| void rsnd_gen_remove(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| @@ -248,7 +247,6 @@ void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, |
| int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod); |
| int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); |
| int rsnd_adg_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv); |
| void rsnd_adg_remove(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| @@ -305,6 +303,7 @@ struct rsnd_priv { |
| }; |
| |
| #define rsnd_priv_to_dev(priv) ((priv)->dev) |
| +#define rsnd_priv_to_info(priv) ((priv)->info) |
| #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) |
| #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) |
| |
| @@ -312,7 +311,6 @@ struct rsnd_priv { |
| * R-Car SCU |
| */ |
| int rsnd_scu_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv); |
| void rsnd_scu_remove(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| @@ -327,7 +325,6 @@ unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, |
| * R-Car SSI |
| */ |
| int rsnd_ssi_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv); |
| void rsnd_ssi_remove(struct platform_device *pdev, |
| struct rsnd_priv *priv); |
| diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c |
| index 3984d4b4f2df..82d8b20a6ffb 100644 |
| --- a/sound/soc/sh/rcar/scu.c |
| +++ b/sound/soc/sh/rcar/scu.c |
| @@ -604,9 +604,9 @@ struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id) |
| } |
| |
| int rsnd_scu_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| + struct rcar_snd_info *info = rsnd_priv_to_info(priv); |
| struct device *dev = rsnd_priv_to_dev(priv); |
| struct rsnd_scu *scu; |
| struct rsnd_mod_ops *ops; |
| diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c |
| index d3371d798d54..2460c9f564de 100644 |
| --- a/sound/soc/sh/rcar/ssi.c |
| +++ b/sound/soc/sh/rcar/ssi.c |
| @@ -511,9 +511,9 @@ static void rsnd_ssi_parent_clk_setup(struct rsnd_priv *priv, struct rsnd_ssi *s |
| } |
| |
| int rsnd_ssi_probe(struct platform_device *pdev, |
| - struct rcar_snd_info *info, |
| struct rsnd_priv *priv) |
| { |
| + struct rcar_snd_info *info = rsnd_priv_to_info(priv); |
| struct rsnd_ssi_platform_info *pinfo; |
| struct device *dev = rsnd_priv_to_dev(priv); |
| struct rsnd_mod_ops *ops; |
| -- |
| 2.1.2 |
| |