Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f30b4ca4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f0b04d8b

sound/soc/sh/rcar/core.c

+3 −2
Original line number Diff line number Diff line
@@ -488,8 +488,7 @@ static int rsnd_status_update(u32 *status, 


#define rsnd_dai_call(fn, io, param...)					\

({									\

	struct rsnd_priv *priv = rsnd_io_to_priv(io);			\

	struct device *dev = rsnd_priv_to_dev(priv);			\

	struct device *dev = rsnd_priv_to_dev(rsnd_io_to_priv(io));	\

	struct rsnd_mod *mod;						\

	int is_play = rsnd_io_is_play(io);				\

	int ret = 0, i;							\
@@ -741,6 +740,7 @@ static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream, 
				struct snd_soc_dai *dai)

{

	struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);

	struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);

	struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);

	int ret;
@@ -758,6 +758,7 @@ static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream, 
				  struct snd_soc_dai *dai)

{

	struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);

	struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);

	struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);



	/*