| From b6ecea4baf55e2fe786be5aff3cb17c742da5bed Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 23 Jan 2014 18:39:12 -0800 |
| Subject: ASoC: rsnd: rsnd_dai_is_clk_master() can be shared |
| |
| Current rsnd driver is using ssi local |
| rsnd_rdai_is_clk_master() for checking clock master. |
| But it can be rsnd_dai_is_clk_master(), and share in each file |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit e779a20da90b12d17af74fe544fafd814b66dc63) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/rsnd.h | 1 + |
| sound/soc/sh/rcar/ssi.c | 9 ++++----- |
| 2 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index faacdcb8f05b..cd396dda85c5 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -215,6 +215,7 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai); |
| |
| void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt); |
| int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional); |
| +#define rsnd_dai_is_clk_master(rdai) ((rdai)->clk_master) |
| |
| /* |
| * R-Car Gen1/Gen2 |
| diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c |
| index ef3d45045d1f..ddcca067908c 100644 |
| --- a/sound/soc/sh/rcar/ssi.c |
| +++ b/sound/soc/sh/rcar/ssi.c |
| @@ -95,7 +95,6 @@ struct rsnd_ssiu { |
| #define rsnd_ssi_dma_available(ssi) \ |
| rsnd_dma_available(rsnd_mod_to_dma(&(ssi)->mod)) |
| #define rsnd_ssi_clk_from_parent(ssi) ((ssi)->parent) |
| -#define rsnd_rdai_is_clk_master(rdai) ((rdai)->clk_master) |
| #define rsnd_ssi_mode_flags(p) ((p)->info->flags) |
| #define rsnd_ssi_dai_id(ssi) ((ssi)->info->dai_id) |
| #define rsnd_ssi_to_ssiu(ssi)\ |
| @@ -133,7 +132,7 @@ static void rsnd_ssi_mode_set(struct rsnd_priv *priv, |
| #define ssi_parent_set(p, sync, adg, ext) \ |
| do { \ |
| ssi->parent = ssiu->ssi + p; \ |
| - if (rsnd_rdai_is_clk_master(rdai)) \ |
| + if (rsnd_dai_is_clk_master(rdai)) \ |
| val = adg; \ |
| else \ |
| val = ext; \ |
| @@ -252,7 +251,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi, |
| if (0 == ssi->usrcnt) { |
| clk_enable(ssi->clk); |
| |
| - if (rsnd_rdai_is_clk_master(rdai)) { |
| + if (rsnd_dai_is_clk_master(rdai)) { |
| if (rsnd_ssi_clk_from_parent(ssi)) |
| rsnd_ssi_hw_start(ssi->parent, rdai, io); |
| else |
| @@ -302,7 +301,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi, |
| rsnd_mod_write(&ssi->mod, SSICR, cr); /* disabled all */ |
| rsnd_ssi_status_check(&ssi->mod, IIRQ); |
| |
| - if (rsnd_rdai_is_clk_master(rdai)) { |
| + if (rsnd_dai_is_clk_master(rdai)) { |
| if (rsnd_ssi_clk_from_parent(ssi)) |
| rsnd_ssi_hw_stop(ssi->parent, rdai); |
| else |
| @@ -522,7 +521,7 @@ static int rsnd_ssi_dma_start(struct rsnd_mod *mod, |
| rsnd_ssi_hw_start(ssi, ssi->rdai, io); |
| |
| /* enable WS continue */ |
| - if (rsnd_rdai_is_clk_master(rdai)) |
| + if (rsnd_dai_is_clk_master(rdai)) |
| rsnd_mod_write(&ssi->mod, SSIWSR, CONT); |
| |
| return 0; |
| -- |
| 2.1.2 |
| |