diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:11:28 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 08:10:54 +0200 |
| commit | 6d416f594bf9a290406d267e2627c5286f51ea59 (patch) | |
| tree | e304cf4f86bcbb3e7ba09f430e2f3583d844b4b2 /sound/drivers | |
| parent | 04eeb606a8383b306f4bc6991da8231b5f3924b0 (diff) | |
| download | linux-stable-6d416f594bf9a290406d267e2627c5286f51ea59.tar.gz linux-stable-6d416f594bf9a290406d267e2627c5286f51ea59.tar.bz2 linux-stable-6d416f594bf9a290406d267e2627c5286f51ea59.zip | |
ALSA: mts64: Use snd_ctl_elem_info()
... and reduce the open codes. Also add missing const to the text array.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers')
| -rw-r--r-- | sound/drivers/mts64.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index f5fd448dbc57..0388fbbd2c06 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -604,21 +604,11 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_frames = { static int snd_mts64_ctl_smpte_fps_info(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *uinfo) { - static char *texts[5] = { "24", - "25", - "29.97", - "30D", - "30" }; + static const char * const texts[5] = { + "24", "25", "29.97", "30D", "30" + }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 5; - if (uinfo->value.enumerated.item > 4) - uinfo->value.enumerated.item = 4; - strcpy(uinfo->value.enumerated.name, - texts[uinfo->value.enumerated.item]); - - return 0; + return snd_ctl_enum_info(uinfo, 1, 5, texts); } static int snd_mts64_ctl_smpte_fps_get(struct snd_kcontrol *kctl, |