aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-10-21 23:15:04 -0400
committerMark Brown <broonie@kernel.org>2015-10-22 08:30:01 -0400
commitc9929345018927acaf52c14c57d78116067be6c9 (patch)
treeae7b7b0ea828b2e8c98828144fad79b251938b2f
parent89e3e2c352a523be46be5104bf18e200a8ccd444 (diff)
ASoC: rsnd: rename rsnd_mod_hw_start/stop to rsnd_mod_power_on/off
rsnd_mod_hw_start/stop were unclear naming. It became rsnd_mod_power_on/off by this patch Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sh/rcar/ctu.c4
-rw-r--r--sound/soc/sh/rcar/dvc.c4
-rw-r--r--sound/soc/sh/rcar/mix.c4
-rw-r--r--sound/soc/sh/rcar/rsnd.h4
-rw-r--r--sound/soc/sh/rcar/src.c4
-rw-r--r--sound/soc/sh/rcar/ssi.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index f1541f464f30..3cb214ab848b 100644
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -35,7 +35,7 @@ static int rsnd_ctu_init(struct rsnd_mod *mod,
35 struct rsnd_dai_stream *io, 35 struct rsnd_dai_stream *io,
36 struct rsnd_priv *priv) 36 struct rsnd_priv *priv)
37{ 37{
38 rsnd_mod_hw_start(mod); 38 rsnd_mod_power_on(mod);
39 39
40 rsnd_ctu_initialize_lock(mod); 40 rsnd_ctu_initialize_lock(mod);
41 41
@@ -50,7 +50,7 @@ static int rsnd_ctu_quit(struct rsnd_mod *mod,
50 struct rsnd_dai_stream *io, 50 struct rsnd_dai_stream *io,
51 struct rsnd_priv *priv) 51 struct rsnd_priv *priv)
52{ 52{
53 rsnd_mod_hw_stop(mod); 53 rsnd_mod_power_off(mod);
54 54
55 return 0; 55 return 0;
56} 56}
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index e36c0ac3374b..58f690900e6d 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -153,7 +153,7 @@ static int rsnd_dvc_init(struct rsnd_mod *mod,
153 struct rsnd_dai_stream *io, 153 struct rsnd_dai_stream *io,
154 struct rsnd_priv *priv) 154 struct rsnd_priv *priv)
155{ 155{
156 rsnd_mod_hw_start(mod); 156 rsnd_mod_power_on(mod);
157 157
158 rsnd_dvc_soft_reset(mod); 158 rsnd_dvc_soft_reset(mod);
159 159
@@ -175,7 +175,7 @@ static int rsnd_dvc_quit(struct rsnd_mod *mod,
175 struct rsnd_dai_stream *io, 175 struct rsnd_dai_stream *io,
176 struct rsnd_priv *priv) 176 struct rsnd_priv *priv)
177{ 177{
178 rsnd_mod_hw_stop(mod); 178 rsnd_mod_power_off(mod);
179 179
180 return 0; 180 return 0;
181} 181}
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index ac2687d9ee55..953dd0be9b60 100644
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -58,7 +58,7 @@ static int rsnd_mix_init(struct rsnd_mod *mod,
58 struct rsnd_dai_stream *io, 58 struct rsnd_dai_stream *io,
59 struct rsnd_priv *priv) 59 struct rsnd_priv *priv)
60{ 60{
61 rsnd_mod_hw_start(mod); 61 rsnd_mod_power_on(mod);
62 62
63 rsnd_mix_soft_reset(mod); 63 rsnd_mix_soft_reset(mod);
64 64
@@ -83,7 +83,7 @@ static int rsnd_mix_quit(struct rsnd_mod *mod,
83 struct rsnd_dai_stream *io, 83 struct rsnd_dai_stream *io,
84 struct rsnd_priv *priv) 84 struct rsnd_priv *priv)
85{ 85{
86 rsnd_mod_hw_stop(mod); 86 rsnd_mod_power_off(mod);
87 87
88 return 0; 88 return 0;
89} 89}
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index e9fef53968b4..38c16d7cd2e8 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -330,8 +330,8 @@ struct rsnd_mod {
330#define rsnd_mod_to_priv(mod) ((mod)->priv) 330#define rsnd_mod_to_priv(mod) ((mod)->priv)
331#define rsnd_mod_to_dma(mod) (&(mod)->dma) 331#define rsnd_mod_to_dma(mod) (&(mod)->dma)
332#define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1) 332#define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1)
333#define rsnd_mod_hw_start(mod) clk_enable((mod)->clk) 333#define rsnd_mod_power_on(mod) clk_enable((mod)->clk)
334#define rsnd_mod_hw_stop(mod) clk_disable((mod)->clk) 334#define rsnd_mod_power_off(mod) clk_disable((mod)->clk)
335#define rsnd_mod_get(ip) (&(ip)->mod) 335#define rsnd_mod_get(ip) (&(ip)->mod)
336 336
337int rsnd_mod_init(struct rsnd_priv *priv, 337int rsnd_mod_init(struct rsnd_priv *priv,
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 1d379e825a9d..37d41f06b3d0 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -352,7 +352,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
352{ 352{
353 struct rsnd_src *src = rsnd_mod_to_src(mod); 353 struct rsnd_src *src = rsnd_mod_to_src(mod);
354 354
355 rsnd_mod_hw_start(mod); 355 rsnd_mod_power_on(mod);
356 356
357 rsnd_src_soft_reset(mod); 357 rsnd_src_soft_reset(mod);
358 358
@@ -373,7 +373,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
373 struct rsnd_src *src = rsnd_mod_to_src(mod); 373 struct rsnd_src *src = rsnd_mod_to_src(mod);
374 struct device *dev = rsnd_priv_to_dev(priv); 374 struct device *dev = rsnd_priv_to_dev(priv);
375 375
376 rsnd_mod_hw_stop(mod); 376 rsnd_mod_power_off(mod);
377 377
378 if (src->err) 378 if (src->err)
379 dev_warn(dev, "%s[%d] under/over flow err = %d\n", 379 dev_warn(dev, "%s[%d] under/over flow err = %d\n",
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 40e2b5de5875..d70720a42cfd 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -184,7 +184,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
184 u32 cr; 184 u32 cr;
185 185
186 if (0 == ssi->usrcnt) { 186 if (0 == ssi->usrcnt) {
187 rsnd_mod_hw_start(mod); 187 rsnd_mod_power_on(mod);
188 188
189 if (rsnd_rdai_is_clk_master(rdai)) { 189 if (rsnd_rdai_is_clk_master(rdai)) {
190 struct rsnd_ssi *ssi_parent = rsnd_ssi_parent(ssi); 190 struct rsnd_ssi *ssi_parent = rsnd_ssi_parent(ssi);
@@ -265,7 +265,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_dai_stream *io, struct rsnd_ssi *ssi)
265 rsnd_ssi_master_clk_stop(ssi); 265 rsnd_ssi_master_clk_stop(ssi);
266 } 266 }
267 267
268 rsnd_mod_hw_stop(mod); 268 rsnd_mod_power_off(mod);
269 269
270 ssi->chan = 0; 270 ssi->chan = 0;
271 } 271 }