[PATCH 2/2] ASoC: core: Use snd_ctl_enum_info()

[Takashi Iwai]

... and reduce the open codes.

Signed-off-by: Takashi Iwai <***@suse.de>
---
sound/soc/soc-core.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4c8f8a23a0e9..96ecdc30eb60 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2348,16 +2348,8 @@ int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
{
struct soc_enum *e = (struct soc_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->items;
-
- if (uinfo->value.enumerated.item >= e->items)
- uinfo->value.enumerated.item = e->items - 1;
- strlcpy(uinfo->value.enumerated.name,
- e->texts[uinfo->value.enumerated.item],
- sizeof(uinfo->value.enumerated.name));
- return 0;
+ return snd_ctl_enum_info(uinfo, e->shift_l == e->shift_r ? 1 : 2,
+ e->items, e->texts);
}
EXPORT_SYMBOL_GPL(snd_soc_info_enum_double);

[Takashi Iwai]

... and reduce the open codes.

Signed-off-by: Takashi Iwai <***@suse.de>
---
sound/soc/s6000/s6105-ipcam.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c
index 3510c01f8a6a..e1e159257b57 100644
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@ -80,16 +80,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
static int output_type_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
- uinfo->count = 1;
- uinfo->value.enumerated.items = 2;
- if (uinfo->value.enumerated.item) {
- uinfo->value.enumerated.item = 1;
- strcpy(uinfo->value.enumerated.name, "HPLOUT/HPROUT");
- } else {
- strcpy(uinfo->value.enumerated.name, "HPLOUT/HPLCOM");
- }
- return 0;
+ static const char * const texts[] = {
+ "HPLOUT/HPLCOM", "HPLOUT/HPROUT",
+ };
+
+ return snd_ctl_enum_info(uinfo, 1, 2, texts);
}

static int output_type_get(struct snd_kcontrol *kcontrol,

[Lars-Peter Clausen]

Post by Takashi Iwai
... and reduce the open codes.

There is another patch from a couple of days back which removes this driver,
so I guess this patch can be dropped.

[Takashi Iwai]

At Tue, 21 Oct 2014 15:24:38 +0200,

Post by Lars-Peter Clausen

Post by Takashi Iwai
... and reduce the open codes.

There is another patch from a couple of days back which removes this driver,
so I guess this patch can be dropped.

OK, good to know.


Takashi

[Mark Brown]

Post by Takashi Iwai
... and reduce the open codes.

Applied, thanks.