Skip to content

Commit

Permalink
ASoC: rsnd: rename rsnd_mod_hw_start/stop to rsnd_mod_power_on/off
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Oct 22, 2015
1 parent 89e3e2c commit c992934
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/ctu.c
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ static int rsnd_ctu_init(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_start(mod);
rsnd_mod_power_on(mod);

rsnd_ctu_initialize_lock(mod);

@@ -50,7 +50,7 @@ static int rsnd_ctu_quit(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_stop(mod);
rsnd_mod_power_off(mod);

return 0;
}
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/dvc.c
Original file line number Diff line number Diff line change
@@ -153,7 +153,7 @@ static int rsnd_dvc_init(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_start(mod);
rsnd_mod_power_on(mod);

rsnd_dvc_soft_reset(mod);

@@ -175,7 +175,7 @@ static int rsnd_dvc_quit(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_stop(mod);
rsnd_mod_power_off(mod);

return 0;
}
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/mix.c
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ static int rsnd_mix_init(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_start(mod);
rsnd_mod_power_on(mod);

rsnd_mix_soft_reset(mod);

@@ -83,7 +83,7 @@ static int rsnd_mix_quit(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
rsnd_mod_hw_stop(mod);
rsnd_mod_power_off(mod);

return 0;
}
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/rsnd.h
Original file line number Diff line number Diff line change
@@ -330,8 +330,8 @@ struct rsnd_mod {
#define rsnd_mod_to_priv(mod) ((mod)->priv)
#define rsnd_mod_to_dma(mod) (&(mod)->dma)
#define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1)
#define rsnd_mod_hw_start(mod) clk_enable((mod)->clk)
#define rsnd_mod_hw_stop(mod) clk_disable((mod)->clk)
#define rsnd_mod_power_on(mod) clk_enable((mod)->clk)
#define rsnd_mod_power_off(mod) clk_disable((mod)->clk)
#define rsnd_mod_get(ip) (&(ip)->mod)

int rsnd_mod_init(struct rsnd_priv *priv,
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/src.c
Original file line number Diff line number Diff line change
@@ -352,7 +352,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
{
struct rsnd_src *src = rsnd_mod_to_src(mod);

rsnd_mod_hw_start(mod);
rsnd_mod_power_on(mod);

rsnd_src_soft_reset(mod);

@@ -373,7 +373,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
struct rsnd_src *src = rsnd_mod_to_src(mod);
struct device *dev = rsnd_priv_to_dev(priv);

rsnd_mod_hw_stop(mod);
rsnd_mod_power_off(mod);

if (src->err)
dev_warn(dev, "%s[%d] under/over flow err = %d\n",
4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/ssi.c
Original file line number Diff line number Diff line change
@@ -184,7 +184,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
u32 cr;

if (0 == ssi->usrcnt) {
rsnd_mod_hw_start(mod);
rsnd_mod_power_on(mod);

if (rsnd_rdai_is_clk_master(rdai)) {
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)
rsnd_ssi_master_clk_stop(ssi);
}

rsnd_mod_hw_stop(mod);
rsnd_mod_power_off(mod);

ssi->chan = 0;
}

0 comments on commit c992934

Please sign in to comment.