diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-18 03:14:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-19 10:53:02 -0500 |
commit | 26d34b11af6a344da6191beca2e2883f65d2597a (patch) | |
tree | 54f20ae0385b9cfb5887ed3fdb8dbb97eaca56a3 | |
parent | 1120dbff2abd3dd9ca3f0736d0690b9592cdadb3 (diff) |
ASoC: rsnd: SSI function parameter uses "mod" instead of "ssi"
To reduce confusion, SSI uses "mod" instead of "ssi"
as function parameter
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/ssi.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index a72ce284e34b..c5c4510afb2d 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c | |||
@@ -188,14 +188,14 @@ u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) | |||
188 | return mask; | 188 | return mask; |
189 | } | 189 | } |
190 | 190 | ||
191 | static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, | 191 | static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, |
192 | struct rsnd_dai_stream *io) | 192 | struct rsnd_dai_stream *io) |
193 | { | 193 | { |
194 | struct rsnd_priv *priv = rsnd_io_to_priv(io); | 194 | struct rsnd_priv *priv = rsnd_io_to_priv(io); |
195 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); | 195 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); |
196 | struct device *dev = rsnd_priv_to_dev(priv); | 196 | struct device *dev = rsnd_priv_to_dev(priv); |
197 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); | 197 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); |
198 | struct rsnd_mod *mod = rsnd_mod_get(ssi); | 198 | struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); |
199 | struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); | 199 | struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); |
200 | int slots = rsnd_get_slot_width(io); | 200 | int slots = rsnd_get_slot_width(io); |
201 | int j, ret; | 201 | int j, ret; |
@@ -255,11 +255,11 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, | |||
255 | return -EIO; | 255 | return -EIO; |
256 | } | 256 | } |
257 | 257 | ||
258 | static void rsnd_ssi_master_clk_stop(struct rsnd_ssi *ssi, | 258 | static void rsnd_ssi_master_clk_stop(struct rsnd_mod *mod, |
259 | struct rsnd_dai_stream *io) | 259 | struct rsnd_dai_stream *io) |
260 | { | 260 | { |
261 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); | 261 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); |
262 | struct rsnd_mod *mod = rsnd_mod_get(ssi); | 262 | struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); |
263 | struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); | 263 | struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); |
264 | 264 | ||
265 | if (!rsnd_rdai_is_clk_master(rdai)) | 265 | if (!rsnd_rdai_is_clk_master(rdai)) |
@@ -277,11 +277,12 @@ static void rsnd_ssi_master_clk_stop(struct rsnd_ssi *ssi, | |||
277 | rsnd_adg_ssi_clk_stop(mod); | 277 | rsnd_adg_ssi_clk_stop(mod); |
278 | } | 278 | } |
279 | 279 | ||
280 | static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, | 280 | static int rsnd_ssi_config_init(struct rsnd_mod *mod, |
281 | struct rsnd_dai_stream *io) | 281 | struct rsnd_dai_stream *io) |
282 | { | 282 | { |
283 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); | 283 | struct rsnd_dai *rdai = rsnd_io_to_rdai(io); |
284 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); | 284 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); |
285 | struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); | ||
285 | u32 cr_own; | 286 | u32 cr_own; |
286 | u32 cr_mode; | 287 | u32 cr_mode; |
287 | u32 wsr; | 288 | u32 wsr; |
@@ -317,7 +318,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi, | |||
317 | return -EINVAL; | 318 | return -EINVAL; |
318 | } | 319 | } |
319 | 320 | ||
320 | if (rsnd_ssi_is_dma_mode(rsnd_mod_get(ssi))) { | 321 | if (rsnd_ssi_is_dma_mode(mod)) { |
321 | cr_mode = UIEN | OIEN | /* over/under run */ | 322 | cr_mode = UIEN | OIEN | /* over/under run */ |
322 | DMEN; /* DMA : enable DMA */ | 323 | DMEN; /* DMA : enable DMA */ |
323 | } else { | 324 | } else { |
@@ -356,14 +357,14 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, | |||
356 | 357 | ||
357 | rsnd_mod_power_on(mod); | 358 | rsnd_mod_power_on(mod); |
358 | 359 | ||
359 | ret = rsnd_ssi_master_clk_start(ssi, io); | 360 | ret = rsnd_ssi_master_clk_start(mod, io); |
360 | if (ret < 0) | 361 | if (ret < 0) |
361 | return ret; | 362 | return ret; |
362 | 363 | ||
363 | if (rsnd_ssi_is_parent(mod, io)) | 364 | if (rsnd_ssi_is_parent(mod, io)) |
364 | return 0; | 365 | return 0; |
365 | 366 | ||
366 | ret = rsnd_ssi_config_init(ssi, io); | 367 | ret = rsnd_ssi_config_init(mod, io); |
367 | if (ret < 0) | 368 | if (ret < 0) |
368 | return ret; | 369 | return ret; |
369 | 370 | ||
@@ -389,7 +390,7 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod, | |||
389 | if (!rsnd_ssi_is_parent(mod, io)) | 390 | if (!rsnd_ssi_is_parent(mod, io)) |
390 | ssi->cr_own = 0; | 391 | ssi->cr_own = 0; |
391 | 392 | ||
392 | rsnd_ssi_master_clk_stop(ssi, io); | 393 | rsnd_ssi_master_clk_stop(mod, io); |
393 | 394 | ||
394 | rsnd_mod_power_off(mod); | 395 | rsnd_mod_power_off(mod); |
395 | 396 | ||