From 53803aead010a314f76a8a6fa132fdcc5edf55ed Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 7 Feb 2012 19:48:47 +0000 Subject: [PATCH] ALSA: Use a define for the number of jack switch types This is intended to facilitate the merge of the two jack detection mechanisms. Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai --- include/sound/jack.h | 3 +++ sound/core/jack.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 63c790742db..58916573db5 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -53,6 +53,9 @@ enum snd_jack_types { SND_JACK_BTN_5 = 0x0200, }; +/* Keep in sync with definitions above */ +#define SND_JACK_SWITCH_TYPES 6 + struct snd_jack { struct input_dev *input_dev; int registered; diff --git a/sound/core/jack.c b/sound/core/jack.c index 26edf63b265..471e1e3b0a9 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -25,7 +25,7 @@ #include #include -static int jack_switch_types[] = { +static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { SW_HEADPHONE_INSERT, SW_MICROPHONE_INSERT, SW_LINEOUT_INSERT, @@ -128,7 +128,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, jack->type = type; - for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) + for (i = 0; i < SND_JACK_SWITCH_TYPES; i++) if (type & (1 << i)) input_set_capability(jack->input_dev, EV_SW, jack_switch_types[i]); -- 2.39.2