diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-02-25 01:15:00 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-02 20:19:21 -0500 |
commit | 5da39cf30454bbf3e92f56935e7d137e5bd2c830 (patch) | |
tree | 6773f420dcedbddb2548a1d71a1e81d3c63b5d9e /sound/soc/sh | |
parent | d870a91e9d0eae524ac2da7cbdc7e399a71b86c4 (diff) |
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>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/rcar/adg.c | 1 | ||||
-rw-r--r-- | sound/soc/sh/rcar/core.c | 11 | ||||
-rw-r--r-- | sound/soc/sh/rcar/gen.c | 7 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 5 | ||||
-rw-r--r-- | sound/soc/sh/rcar/scu.c | 2 | ||||
-rw-r--r-- | 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) | |||
391 | } | 391 | } |
392 | 392 | ||
393 | int rsnd_adg_probe(struct platform_device *pdev, | 393 | int rsnd_adg_probe(struct platform_device *pdev, |
394 | struct rcar_snd_info *info, | ||
395 | struct rsnd_priv *priv) | 394 | struct rsnd_priv *priv) |
396 | { | 395 | { |
397 | struct rsnd_adg *adg; | 396 | 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 = { | |||
577 | }; | 577 | }; |
578 | 578 | ||
579 | static int rsnd_dai_probe(struct platform_device *pdev, | 579 | static int rsnd_dai_probe(struct platform_device *pdev, |
580 | struct rcar_snd_info *info, | ||
581 | struct rsnd_priv *priv) | 580 | struct rsnd_priv *priv) |
582 | { | 581 | { |
583 | struct snd_soc_dai_driver *drv; | 582 | struct snd_soc_dai_driver *drv; |
@@ -773,23 +772,23 @@ static int rsnd_probe(struct platform_device *pdev) | |||
773 | /* | 772 | /* |
774 | * init each module | 773 | * init each module |
775 | */ | 774 | */ |
776 | ret = rsnd_gen_probe(pdev, info, priv); | 775 | ret = rsnd_gen_probe(pdev, priv); |
777 | if (ret) | 776 | if (ret) |
778 | return ret; | 777 | return ret; |
779 | 778 | ||
780 | ret = rsnd_ssi_probe(pdev, info, priv); | 779 | ret = rsnd_ssi_probe(pdev, priv); |
781 | if (ret) | 780 | if (ret) |
782 | return ret; | 781 | return ret; |
783 | 782 | ||
784 | ret = rsnd_scu_probe(pdev, info, priv); | 783 | ret = rsnd_scu_probe(pdev, priv); |
785 | if (ret) | 784 | if (ret) |
786 | return ret; | 785 | return ret; |
787 | 786 | ||
788 | ret = rsnd_adg_probe(pdev, info, priv); | 787 | ret = rsnd_adg_probe(pdev, priv); |
789 | if (ret) | 788 | if (ret) |
790 | return ret; | 789 | return ret; |
791 | 790 | ||
792 | ret = rsnd_dai_probe(pdev, info, priv); | 791 | ret = rsnd_dai_probe(pdev, priv); |
793 | if (ret) | 792 | if (ret) |
794 | return ret; | 793 | return ret; |
795 | 794 | ||
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) | |||
276 | } | 276 | } |
277 | 277 | ||
278 | static int rsnd_gen2_probe(struct platform_device *pdev, | 278 | static int rsnd_gen2_probe(struct platform_device *pdev, |
279 | struct rcar_snd_info *info, | ||
280 | struct rsnd_priv *priv) | 279 | struct rsnd_priv *priv) |
281 | { | 280 | { |
282 | struct device *dev = rsnd_priv_to_dev(priv); | 281 | 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) | |||
374 | } | 373 | } |
375 | 374 | ||
376 | static int rsnd_gen1_probe(struct platform_device *pdev, | 375 | static int rsnd_gen1_probe(struct platform_device *pdev, |
377 | struct rcar_snd_info *info, | ||
378 | struct rsnd_priv *priv) | 376 | struct rsnd_priv *priv) |
379 | { | 377 | { |
380 | struct device *dev = rsnd_priv_to_dev(priv); | 378 | struct device *dev = rsnd_priv_to_dev(priv); |
@@ -419,7 +417,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev, | |||
419 | * Gen | 417 | * Gen |
420 | */ | 418 | */ |
421 | int rsnd_gen_probe(struct platform_device *pdev, | 419 | int rsnd_gen_probe(struct platform_device *pdev, |
422 | struct rcar_snd_info *info, | ||
423 | struct rsnd_priv *priv) | 420 | struct rsnd_priv *priv) |
424 | { | 421 | { |
425 | struct device *dev = rsnd_priv_to_dev(priv); | 422 | struct device *dev = rsnd_priv_to_dev(priv); |
@@ -436,9 +433,9 @@ int rsnd_gen_probe(struct platform_device *pdev, | |||
436 | 433 | ||
437 | ret = -ENODEV; | 434 | ret = -ENODEV; |
438 | if (rsnd_is_gen1(priv)) | 435 | if (rsnd_is_gen1(priv)) |
439 | ret = rsnd_gen1_probe(pdev, info, priv); | 436 | ret = rsnd_gen1_probe(pdev, priv); |
440 | else if (rsnd_is_gen2(priv)) | 437 | else if (rsnd_is_gen2(priv)) |
441 | ret = rsnd_gen2_probe(pdev, info, priv); | 438 | ret = rsnd_gen2_probe(pdev, priv); |
442 | 439 | ||
443 | if (ret < 0) | 440 | if (ret < 0) |
444 | dev_err(dev, "unknown generation R-Car sound device\n"); | 441 | 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); | |||
226 | * R-Car Gen1/Gen2 | 226 | * R-Car Gen1/Gen2 |
227 | */ | 227 | */ |
228 | int rsnd_gen_probe(struct platform_device *pdev, | 228 | int rsnd_gen_probe(struct platform_device *pdev, |
229 | struct rcar_snd_info *info, | ||
230 | struct rsnd_priv *priv); | 229 | struct rsnd_priv *priv); |
231 | void rsnd_gen_remove(struct platform_device *pdev, | 230 | void rsnd_gen_remove(struct platform_device *pdev, |
232 | struct rsnd_priv *priv); | 231 | struct rsnd_priv *priv); |
@@ -248,7 +247,6 @@ void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, | |||
248 | int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod); | 247 | int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod); |
249 | int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); | 248 | int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); |
250 | int rsnd_adg_probe(struct platform_device *pdev, | 249 | int rsnd_adg_probe(struct platform_device *pdev, |
251 | struct rcar_snd_info *info, | ||
252 | struct rsnd_priv *priv); | 250 | struct rsnd_priv *priv); |
253 | void rsnd_adg_remove(struct platform_device *pdev, | 251 | void rsnd_adg_remove(struct platform_device *pdev, |
254 | struct rsnd_priv *priv); | 252 | struct rsnd_priv *priv); |
@@ -305,6 +303,7 @@ struct rsnd_priv { | |||
305 | }; | 303 | }; |
306 | 304 | ||
307 | #define rsnd_priv_to_dev(priv) ((priv)->dev) | 305 | #define rsnd_priv_to_dev(priv) ((priv)->dev) |
306 | #define rsnd_priv_to_info(priv) ((priv)->info) | ||
308 | #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) | 307 | #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags) |
309 | #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) | 308 | #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags) |
310 | 309 | ||
@@ -312,7 +311,6 @@ struct rsnd_priv { | |||
312 | * R-Car SCU | 311 | * R-Car SCU |
313 | */ | 312 | */ |
314 | int rsnd_scu_probe(struct platform_device *pdev, | 313 | int rsnd_scu_probe(struct platform_device *pdev, |
315 | struct rcar_snd_info *info, | ||
316 | struct rsnd_priv *priv); | 314 | struct rsnd_priv *priv); |
317 | void rsnd_scu_remove(struct platform_device *pdev, | 315 | void rsnd_scu_remove(struct platform_device *pdev, |
318 | struct rsnd_priv *priv); | 316 | struct rsnd_priv *priv); |
@@ -327,7 +325,6 @@ unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, | |||
327 | * R-Car SSI | 325 | * R-Car SSI |
328 | */ | 326 | */ |
329 | int rsnd_ssi_probe(struct platform_device *pdev, | 327 | int rsnd_ssi_probe(struct platform_device *pdev, |
330 | struct rcar_snd_info *info, | ||
331 | struct rsnd_priv *priv); | 328 | struct rsnd_priv *priv); |
332 | void rsnd_ssi_remove(struct platform_device *pdev, | 329 | void rsnd_ssi_remove(struct platform_device *pdev, |
333 | struct rsnd_priv *priv); | 330 | 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) | |||
604 | } | 604 | } |
605 | 605 | ||
606 | int rsnd_scu_probe(struct platform_device *pdev, | 606 | int rsnd_scu_probe(struct platform_device *pdev, |
607 | struct rcar_snd_info *info, | ||
608 | struct rsnd_priv *priv) | 607 | struct rsnd_priv *priv) |
609 | { | 608 | { |
609 | struct rcar_snd_info *info = rsnd_priv_to_info(priv); | ||
610 | struct device *dev = rsnd_priv_to_dev(priv); | 610 | struct device *dev = rsnd_priv_to_dev(priv); |
611 | struct rsnd_scu *scu; | 611 | struct rsnd_scu *scu; |
612 | struct rsnd_mod_ops *ops; | 612 | 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 | |||
511 | } | 511 | } |
512 | 512 | ||
513 | int rsnd_ssi_probe(struct platform_device *pdev, | 513 | int rsnd_ssi_probe(struct platform_device *pdev, |
514 | struct rcar_snd_info *info, | ||
515 | struct rsnd_priv *priv) | 514 | struct rsnd_priv *priv) |
516 | { | 515 | { |
516 | struct rcar_snd_info *info = rsnd_priv_to_info(priv); | ||
517 | struct rsnd_ssi_platform_info *pinfo; | 517 | struct rsnd_ssi_platform_info *pinfo; |
518 | struct device *dev = rsnd_priv_to_dev(priv); | 518 | struct device *dev = rsnd_priv_to_dev(priv); |
519 | struct rsnd_mod_ops *ops; | 519 | struct rsnd_mod_ops *ops; |