diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:15:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 08:49:43 +0200 |
| commit | 3b7a00dc9e4277d6fcad68dd1db35f77264ede5f (patch) | |
| tree | e3e0dd35d1774892e3a2e423c0ad614a5a59fa61 /sound/pci/ac97/ac97_codec.c | |
| parent | ALSA: parisc: Use snd_ctl_enum_info() (diff) | |
| download | linux-3b7a00dc9e4277d6fcad68dd1db35f77264ede5f.tar.xz linux-3b7a00dc9e4277d6fcad68dd1db35f77264ede5f.zip | |
ALSA: ac97: Use snd_ctl_enum_info()
... and reduce the open codes. Also add missing const to text arrays.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 14ad54b7928c..5ee2f17c287c 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -463,14 +463,8 @@ static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, { struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = e->shift_l == e->shift_r ? 1 : 2; - uinfo->value.enumerated.items = e->mask; - - if (uinfo->value.enumerated.item > e->mask - 1) - uinfo->value.enumerated.item = e->mask - 1; - strcpy(uinfo->value.enumerated.name, e->texts[uinfo->value.enumerated.item]); - return 0; + return snd_ctl_enum_info(uinfo, e->shift_l == e->shift_r ? 1 : 2, + e->mask, e->texts); } static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol, |