From: Tobias Klauser Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton --- sound/sparc/dbri.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN sound/sparc/dbri.c~sound-sparc-dbri-use-array_size-macro sound/sparc/dbri.c --- a/sound/sparc/dbri.c~sound-sparc-dbri-use-array_size-macro +++ a/sound/sparc/dbri.c @@ -2412,8 +2412,6 @@ static struct snd_kcontrol_new dbri_cont CS4215_SINGLE("Mic boost", 4, 4, 1, 1) }; -#define NUM_CS4215_CONTROLS (sizeof(dbri_controls)/sizeof(struct snd_kcontrol_new)) - static int __init snd_dbri_mixer(struct snd_dbri * dbri) { struct snd_card *card; @@ -2424,7 +2422,7 @@ static int __init snd_dbri_mixer(struct card = dbri->card; strcpy(card->mixername, card->shortname); - for (idx = 0; idx < NUM_CS4215_CONTROLS; idx++) { + for (idx = 0; idx < ARRAY_SIZE(dbri_controls); idx++) { if ((err = snd_ctl_add(card, snd_ctl_new1(&dbri_controls[idx], dbri))) < 0) return err; _