diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-06-14 03:41:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-06-14 05:47:25 -0400 |
commit | f30b4ca4447095f6923b59ffaa25ca6a54daffac (patch) | |
tree | 67fa6866ba7990cef4b37c5d3504c4dd1e0a6013 | |
parent | f0b04d8b442757f7bcad2cd07b54f63910253ebc (diff) |
ASoC: rsnd: reduce confusable macro parameter magic
rsnd_dai_call() macro is using "priv" inside.
Thus, if caller function doesn't have "priv" related operation, strange
phenomenon occur which code is using "priv", but compiler indicates
"unused variable 'priv'".
>From code point of view, it is not problem, but it is very confusable.
This patch removes "priv" from rsnd_dai_call() macro, and adds "priv"
on caller function.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/sh/rcar/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 0bb99aa70e29..1b536d140e49 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c | |||
@@ -488,8 +488,7 @@ static int rsnd_status_update(u32 *status, | |||
488 | 488 | ||
489 | #define rsnd_dai_call(fn, io, param...) \ | 489 | #define rsnd_dai_call(fn, io, param...) \ |
490 | ({ \ | 490 | ({ \ |
491 | struct rsnd_priv *priv = rsnd_io_to_priv(io); \ | 491 | struct device *dev = rsnd_priv_to_dev(rsnd_io_to_priv(io)); \ |
492 | struct device *dev = rsnd_priv_to_dev(priv); \ | ||
493 | struct rsnd_mod *mod; \ | 492 | struct rsnd_mod *mod; \ |
494 | int is_play = rsnd_io_is_play(io); \ | 493 | int is_play = rsnd_io_is_play(io); \ |
495 | int ret = 0, i; \ | 494 | int ret = 0, i; \ |
@@ -741,6 +740,7 @@ static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream, | |||
741 | struct snd_soc_dai *dai) | 740 | struct snd_soc_dai *dai) |
742 | { | 741 | { |
743 | struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); | 742 | struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); |
743 | struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai); | ||
744 | struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); | 744 | struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); |
745 | int ret; | 745 | int ret; |
746 | 746 | ||
@@ -758,6 +758,7 @@ static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream, | |||
758 | struct snd_soc_dai *dai) | 758 | struct snd_soc_dai *dai) |
759 | { | 759 | { |
760 | struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); | 760 | struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); |
761 | struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai); | ||
761 | struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); | 762 | struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); |
762 | 763 | ||
763 | /* | 764 | /* |