From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: [PATCH 03/19] ASoC: rsnd: remove verbose function parameter
Date: Mon, 24 Feb 2014 22:15:00 -0800 (PST) [thread overview]
Message-ID: <878usz90ri.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <87d2ib90t9.wl%kuninori.morimoto.gx@gmail.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
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 af9e440..69d9394 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 5f6d9fe..b2370f6 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 0a43b90..bcb98f4 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 fb1e0ce..8ac28ac 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 3984d4b..82d8b20 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 d3371d7..2460c9f 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;
--
1.7.9.5
next prev parent reply other threads:[~2014-02-25 6:15 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 6:13 [PATCH 0/19] ASoC: rsnd: new module path method and DT support Kuninori Morimoto
2014-02-25 6:14 ` [PATCH 01/19] ASoC: rsnd: move priv member settings to upper side Kuninori Morimoto
2014-03-03 1:19 ` Mark Brown
2014-02-25 6:14 ` [PATCH 02/19] ASoC: rsnd: move rsnd_mod_call() macro Kuninori Morimoto
2014-03-03 1:19 ` Mark Brown
2014-02-25 6:15 ` Kuninori Morimoto [this message]
2014-03-03 1:19 ` [PATCH 03/19] ASoC: rsnd: remove verbose function parameter Mark Brown
2014-02-25 6:15 ` [PATCH 04/19] ASoC: rsnd: remove verbose debug message from scu/ssi Kuninori Morimoto
2014-03-03 1:20 ` Mark Brown
2014-02-25 6:15 ` [PATCH 05/19] ASoC: rsnd: unify rdai naming Kuninori Morimoto
2014-03-03 1:20 ` Mark Brown
2014-02-25 6:15 ` [PATCH 06/19] ASoC: rsnd: add .set_sysclk on snd_soc_dai_ops Kuninori Morimoto
2014-03-03 1:18 ` Mark Brown
2014-03-03 2:08 ` Kuninori Morimoto
2014-03-03 2:12 ` Kuninori Morimoto
2014-03-03 7:45 ` Kuninori Morimoto
2014-02-25 6:15 ` [PATCH 07/19] ASoC: rsnd: tidyup RSND_SSI_xxx flags Kuninori Morimoto
2014-03-03 1:21 ` Mark Brown
2014-02-25 6:15 ` [PATCH 08/19] ASoC: rsnd: run rsnd_path_init() when probe() timing Kuninori Morimoto
2014-03-03 1:22 ` Mark Brown
2014-02-25 6:15 ` [PATCH 09/19] ASoC: rsnd: use mod array instead of list on rdai Kuninori Morimoto
2014-02-25 6:15 ` [PATCH 10/19] ASoC: rsnd: get ssi/scu from rsnd_dai_stream Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 11/19] ASoC: rsnd: add struct rsnd_dai_platform_info Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 12/19] ASoC: rsnd: use function pointer for each probe Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 13/19] ASoC: rsnd: Get correct SCU ID Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 14/19] ASoC: rsnd: add rsnd_scu_enable_ssi_irq() Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 15/19] ASoC: rsnd: call rsnd_scu_ssi_mode_init() from SSI Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 16/19] ASoC: rsnd: add probe/remove callback on rsnd_mod_ops Kuninori Morimoto
2014-02-25 6:16 ` [PATCH 17/19] ASoC: rsnd: use mod probe method on SCU Kuninori Morimoto
2014-02-25 6:17 ` [PATCH 18/19] ASoC: rsnd: use mod probe method on SSI Kuninori Morimoto
2014-02-25 6:17 ` [PATCH 19/19] ASoC: rsnd: add DeviceTree support Kuninori Morimoto
2014-02-27 5:08 ` [PATCH 0/19] ASoC: rsnd: new module path method and DT support Mark Brown
2014-02-27 10:18 ` Kuninori Morimoto
2014-02-27 11:47 ` Mark Brown
2014-03-03 1:29 ` Mark Brown
2014-03-03 7:42 ` Kuninori Morimoto
2014-03-03 7:42 ` [PATCH 1/8] ASoC: rsnd: run rsnd_path_init() when probe() timing Kuninori Morimoto
2014-03-04 4:13 ` Mark Brown
2014-03-03 7:42 ` [PATCH 2/8] ASoC: rsnd: use mod array instead of list on rdai Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 3/8] ASoC: rsnd: get ssi/scu from rsnd_dai_stream Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 4/8] ASoC: rsnd: use devm_clk_get() instead of clk_get() Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 5/8] ASoC: rsnd: use function pointer for each probe Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 6/8] ASoC: rsnd: remove unused SSI_CONTROL Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 7/8] ASoC: rsnd: modify rsnd_adg_ssi_ws_timing_gen2() parameter Kuninori Morimoto
2014-03-03 7:43 ` [PATCH 8/8] ASoC: rsnd: share reg_field and reduce memory Kuninori Morimoto
2014-03-04 4:49 ` [PATCH 0/19] ASoC: rsnd: new module path method and DT support Kuninori Morimoto
2014-03-04 4:49 ` [PATCH 01/11] ASoC: rsnd: add struct rsnd_dai_platform_info Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 02/11] ASoC: rsnd: Get correct SCU ID Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 03/11] ASoC: rsnd: add rsnd_scu_enable_ssi_irq() Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 04/11] ASoC: rsnd: call rsnd_scu_ssi_mode_init() from SSI Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 05/11] ASoC: rsnd: add probe/remove callback on rsnd_mod_ops Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 06/11] ASoC: rsnd: use mod probe method on SCU Kuninori Morimoto
2014-03-04 4:50 ` [PATCH 07/11] ASoC: rsnd: use mod probe method on SSI Kuninori Morimoto
2014-03-04 4:51 ` [PATCH 08/11] ASoC: rsnd: nothing to do on rsnd_dai_remove() Kuninori Morimoto
2014-03-04 4:51 ` [PATCH 09/11] ASoC: rsnd: remove all rsnd_xxx_remove() Kuninori Morimoto
2014-03-04 4:51 ` [PATCH 10/11] ASoC: rsnd: rename scu to src Kuninori Morimoto
2014-03-05 6:08 ` Mark Brown
2014-03-04 4:51 ` [PATCH 11/11] ASoC: rsnd: add DeviceTree support Kuninori Morimoto
2014-03-05 6:39 ` Forward: " Kuninori Morimoto
2014-03-10 14:52 ` Ben Dooks
[not found] ` <20140310145254.GJ4400-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2014-03-14 0:34 ` [alsa-devel] " Kuninori Morimoto
[not found] ` <87fvmlpqi1.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-18 2:29 ` [PATCH v2] " Kuninori Morimoto
[not found] ` <87ob14jl2d.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-21 18:18 ` Mark Brown
[not found] ` <20140321181813.GP552-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-03-24 0:07 ` Kuninori Morimoto
2014-03-24 3:29 ` [PATCH] ASoC: rcar: subnode tidyup for renesas,rsnd.txt Kuninori Morimoto
[not found] ` <87fvm8i8ah.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-25 13:04 ` Mark Brown
2014-03-10 16:28 ` [PATCH 0/19] ASoC: rsnd: new module path method and DT support Ben Dooks
2014-03-11 0:00 ` Kuninori Morimoto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878usz90ri.wl%kuninori.morimoto.gx@gmail.com \
--to=kuninori.morimoto.gx@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox