From 01a3affb2eebfd6c996c36d82bbbc6040eb3a7f1 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 14 Jan 2008 08:56:01 +0100 Subject: [ALSA] oxygen: use an array of snd_kcontrol pointers Use an array for the pointers to known controls so that it is easier to add more. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- sound/pci/oxygen/oxygen.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sound/pci/oxygen/oxygen.h') diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 248f7ed22fda..a10c37788059 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h @@ -15,6 +15,12 @@ #define PCM_AC97 5 #define PCM_COUNT 6 +enum { + CONTROL_SPDIF_PCM, + CONTROL_SPDIF_INPUT_BITS, + CONTROL_COUNT +}; + #define OXYGEN_PCI_SUBID(sv, sd) \ .vendor = PCI_VENDOR_ID_CMEDIA, \ .device = 0x8788, \ @@ -50,8 +56,7 @@ struct oxygen { u32 spdif_bits; u32 spdif_pcm_bits; struct snd_pcm_substream *streams[PCM_COUNT]; - struct snd_kcontrol *spdif_pcm_ctl; - struct snd_kcontrol *spdif_input_bits_ctl; + struct snd_kcontrol *controls[CONTROL_COUNT]; struct work_struct spdif_input_bits_work; }; -- cgit v1.2.2