diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2008-01-14 08:56:01 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:57 +0100 |
| commit | 01a3affb2eebfd6c996c36d82bbbc6040eb3a7f1 (patch) | |
| tree | a80f44ba4a5d6997d932a7d80e9b517064eb2555 /sound/pci/oxygen/oxygen.h | |
| parent | [ALSA] oxygen: fix channel routing (diff) | |
| download | linux-dev-01a3affb2eebfd6c996c36d82bbbc6040eb3a7f1.tar.xz linux-dev-01a3affb2eebfd6c996c36d82bbbc6040eb3a7f1.zip | |
[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 <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
| -rw-r--r-- | sound/pci/oxygen/oxygen.h | 9 |
1 files changed, 7 insertions, 2 deletions
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; }; |