[alsa-devel] Using ARRAY_SIZE macro when setting up ASoC audio map?
Does an example patch to spitz below make any sense? Yep, noticed when forgot to add array terminator to own code :-) diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index d56709e..1cffcd3 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -268,8 +268,6 @@ static const char *audio_map[][3] = { /* line is connected to input 1 - no bias */ {"LINPUT1", NULL, "Line Jack"}, - - {NULL, NULL, NULL}, }; static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", @@ -317,7 +315,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec) } /* Set up spitz specific audio path audio_map */ - for (i = 0; audio_map[i][0] != NULL; i++) { + for (i = 0; i < ARRAY_SIZE(audio_map); i++) { snd_soc_dapm_connect_input(codec, audio_map[i][0], audio_map[i][1], audio_map[i][2]); }
On Wed, Feb 27, 2008 at 01:49:23PM +0200, Jarkko Nikula wrote:
Does an example patch to spitz below make any sense? Yep, noticed when forgot to add array terminator to own code :-)
Yes, sure.
On Wed, 27 Feb 2008 12:34:18 +0000 "ext Mark Brown" <broonie@opensource.wolfsonmicro.com> wrote:
On Wed, Feb 27, 2008 at 01:49:23PM +0200, Jarkko Nikula wrote:
Does an example patch to spitz below make any sense? Yep, noticed when forgot to add array terminator to own code :-)
Yes, sure.
Ok. Probably not worth to change now to n different drivers but worth to take into account when reviewing new ones or doing some other cleanups. -- Jarkko
On Wed, Feb 27, 2008 at 03:11:51PM +0200, Jarkko Nikula wrote:
Ok. Probably not worth to change now to n different drivers but worth to take into account when reviewing new ones or doing some other cleanups.
For ASoC v2 we've been adding bulk registration functions for everything which should encourage that. This hasn't been done for paths yet but that should be done shortly.
At Wed, 27 Feb 2008 13:49:23 +0200, Jarkko Nikula wrote:
Does an example patch to spitz below make any sense? Yep, noticed when forgot to add array terminator to own code :-)
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index d56709e..1cffcd3 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -268,8 +268,6 @@ static const char *audio_map[][3] = {
/* line is connected to input 1 - no bias */ {"LINPUT1", NULL, "Line Jack"}, - - {NULL, NULL, NULL}, };
static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", @@ -317,7 +315,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec) }
/* Set up spitz specific audio path audio_map */ - for (i = 0; audio_map[i][0] != NULL; i++) { + for (i = 0; i < ARRAY_SIZE(audio_map); i++) {
Does ARRAY_SIZE() work with two-dimensional arrays? Just wondering... Takashi
On Wed, 27 Feb 2008 17:15:49 +0100 "ext Takashi Iwai" <tiwai@suse.de> wrote:
/* Set up spitz specific audio path audio_map */ - for (i = 0; audio_map[i][0] != NULL; i++) { + for (i = 0; i < ARRAY_SIZE(audio_map); i++) {
Does ARRAY_SIZE() work with two-dimensional arrays? Just wondering...
Yes it does when counting number of rows since sizeof(arr[0]) operator in ARRAY_SIZE returns a row size in bytes when used with two-dimensional array. -- Jarkko
participants (3)
-
Jarkko Nikula -
Mark Brown -
Takashi Iwai