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

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

ASoC: rsnd: tidyup original for_each_rsnd_xxx macro 



Current for_each_rsnd_xxx macro will read out-of-array's
memory after last loop operation.
It was not good C language operation, and the binary which was
compiled by (at least) gcc 4.8.1 is broken
This patch tidyup these issues

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 8691d074

sound/soc/sh/rcar/adg.c

+4 −3
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ struct rsnd_adg { 
};



#define for_each_rsnd_clk(pos, adg, i)		\

	for (i = 0, (pos) = adg->clk[i];	\

	     i < CLKMAX;			\

	     i++, (pos) = adg->clk[i])

	for (i = 0;				\

	     (i < CLKMAX) &&			\

	     ((pos) = adg->clk[i]);		\

	     i++)

#define rsnd_priv_to_adg(priv) ((struct rsnd_adg *)(priv)->adg)

sound/soc/sh/rcar/rsnd.h

+4 −3
Original line number Diff line number Diff line
@@ -216,9 +216,10 @@ struct rsnd_dai { 


#define rsnd_dai_nr(priv) ((priv)->dai_nr)

#define for_each_rsnd_dai(rdai, priv, i)		\

	for (i = 0, (rdai) = rsnd_dai_get(priv, i);	\

	     i < rsnd_dai_nr(priv);			\

	     i++, (rdai) = rsnd_dai_get(priv, i))

	for (i = 0;					\

	     (i < rsnd_dai_nr(priv)) &&			\

	     ((rdai) = rsnd_dai_get(priv, i));		\

	     i++)



struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id);

int rsnd_dai_disconnect(struct rsnd_mod *mod);