hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda/via - Simplify control management 

This patch replaces the control element creations in VIA codec driver
with the standard snd_hda_gen_add_kctl() calls as a cleanup.  There
are two major fields targeted by this patch: the beep controls and
static init controls.

The former is converted just like other codec drivers do.  The
spec->beep_amp field can be eliminated by this change as well.

The latter, static init controls, are replaced simply with explicit
snd_hda_gen_add_kctl() calls.

After these conversions, via_build_controls() becomes superfluous and
replaced with snd_hda_gen_build_controls(), too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-06-20 17:20:42 +02:00
parent fcbdcc1a93
commit 0e8f986249
1 changed files with 44 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
sound/pci/hda/patch_via.c
View File

@ -91,9 +91,6 @@ struct via_spec {
struct hda_gen_spec gen; struct hda_gen_spec gen;
/* codec parameterization */ /* codec parameterization */
const struct snd_kcontrol_new *mixers[6];
unsigned int num_mixers;
const struct hda_verb *init_verbs[5]; const struct hda_verb *init_verbs[5];
unsigned int num_iverbs; unsigned int num_iverbs;
@ -107,8 +104,6 @@ struct via_spec {
/* work to check hp jack state */ /* work to check hp jack state */
int hp_work_active; int hp_work_active;
int vt1708_jack_detect; int vt1708_jack_detect;
unsigned int beep_amp;
}; };
static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec); static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec);
@ -262,69 +257,51 @@ static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,
return 1; return 1;
} }
static const struct snd_kcontrol_new via_pin_power_ctl_enum[] = { static const struct snd_kcontrol_new via_pin_power_ctl_enum = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Dynamic Power-Control", .name = "Dynamic Power-Control",
.info = via_pin_power_ctl_info, .info = via_pin_power_ctl_info,
.get = via_pin_power_ctl_get, .get = via_pin_power_ctl_get,
.put = via_pin_power_ctl_put, .put = via_pin_power_ctl_put,
},
{} /* terminator */
}; };
#ifdef CONFIG_SND_HDA_INPUT_BEEP #ifdef CONFIG_SND_HDA_INPUT_BEEP
static inline void set_beep_amp(struct via_spec *spec, hda_nid_t nid,
int idx, int dir)
{
spec->gen.beep_nid = nid;
spec->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
}
/* additional beep mixers; the actual parameters are overwritten at build */ /* additional beep mixers; the actual parameters are overwritten at build */
static const struct snd_kcontrol_new cxt_beep_mixer[] = { static const struct snd_kcontrol_new via_beep_mixer[] = {
HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT), HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),
HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT), HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),
{ } /* end */
}; };
/* create beep controls if needed */ static int set_beep_amp(struct via_spec *spec, hda_nid_t nid,
static int add_beep_ctls(struct hda_codec *codec) int idx, int dir)
{ {
struct via_spec *spec = codec->spec; struct snd_kcontrol_new *knew;
int err; unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
int i;
if (spec->beep_amp) { spec->gen.beep_nid = nid;
const struct snd_kcontrol_new *knew; for (i = 0; i < ARRAY_SIZE(via_beep_mixer); i++) {
for (knew = cxt_beep_mixer; knew->name; knew++) { knew = snd_hda_gen_add_kctl(&spec->gen, NULL,
struct snd_kcontrol *kctl; &via_beep_mixer[i]);
kctl = snd_ctl_new1(knew, codec); if (!knew)
if (!kctl) return -ENOMEM;
return -ENOMEM; knew->private_value = beep_amp;
kctl->private_value = spec->beep_amp;
err = snd_hda_ctl_add(codec, 0, kctl);
if (err < 0)
return err;
}
} }
return 0; return 0;
} }
static void auto_parse_beep(struct hda_codec *codec) static int auto_parse_beep(struct hda_codec *codec)
{ {
struct via_spec *spec = codec->spec; struct via_spec *spec = codec->spec;
hda_nid_t nid; hda_nid_t nid;
for_each_hda_codec_node(nid, codec) for_each_hda_codec_node(nid, codec)
if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP) { if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP)
set_beep_amp(spec, nid, 0, HDA_OUTPUT); return set_beep_amp(spec, nid, 0, HDA_OUTPUT);
break; return 0;
}
} }
#else #else
#define set_beep_amp(spec, nid, idx, dir) /* NOP */ #define auto_parse_beep(codec) 0
#define add_beep_ctls(codec) 0
#define auto_parse_beep(codec)
#endif #endif
/* check AA path's mute status */ /* check AA path's mute status */
@ -403,30 +380,6 @@ static void analog_low_current_mode(struct hda_codec *codec)
return __analog_low_current_mode(codec, false); return __analog_low_current_mode(codec, false);
} }
static int via_build_controls(struct hda_codec *codec)
{
struct via_spec *spec = codec->spec;
int err, i;
err = snd_hda_gen_build_controls(codec);
if (err < 0)
return err;
err = add_beep_ctls(codec);
if (err < 0)
return err;
spec->mixers[spec->num_mixers++] = via_pin_power_ctl_enum;
for (i = 0; i < spec->num_mixers; i++) {
err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
if (err < 0)
return err;
}
return 0;
}
static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo, static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
@ -481,7 +434,7 @@ static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
static int via_init(struct hda_codec *codec); static int via_init(struct hda_codec *codec);
static const struct hda_codec_ops via_patch_ops = { static const struct hda_codec_ops via_patch_ops = {
.build_controls = via_build_controls, .build_controls = snd_hda_gen_build_controls,
.build_pcms = snd_hda_gen_build_pcms, .build_pcms = snd_hda_gen_build_pcms,
.init = via_init, .init = via_init,
.free = via_free, .free = via_free,
@ -545,16 +498,13 @@ static int vt1708_jack_detect_put(struct snd_kcontrol *kcontrol,
return 1; return 1;
} }
static const struct snd_kcontrol_new vt1708_jack_detect_ctl[] = { static const struct snd_kcontrol_new vt1708_jack_detect_ctl = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Jack Detect", .name = "Jack Detect",
.count = 1, .count = 1,
.info = snd_ctl_boolean_mono_info, .info = snd_ctl_boolean_mono_info,
.get = vt1708_jack_detect_get, .get = vt1708_jack_detect_get,
.put = vt1708_jack_detect_put, .put = vt1708_jack_detect_put,
},
{} /* terminator */
}; };
static const struct badness_table via_main_out_badness = { static const struct badness_table via_main_out_badness = {
@ -586,12 +536,17 @@ static int via_parse_auto_config(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
auto_parse_beep(codec);
err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg); err = snd_hda_gen_parse_auto_config(codec, &spec->gen.autocfg);
if (err < 0) if (err < 0)
return err; return err;
err = auto_parse_beep(codec);
if (err < 0)
return err;
if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &via_pin_power_ctl_enum))
return -ENOMEM;
/* disable widget PM at start for compatibility */ /* disable widget PM at start for compatibility */
codec->power_save_node = 0; codec->power_save_node = 0;
spec->gen.power_down_unused = 0; spec->gen.power_down_unused = 0;
@ -623,7 +578,7 @@ static int vt1708_build_controls(struct hda_codec *codec)
int err; int err;
int old_interval = codec->jackpoll_interval; int old_interval = codec->jackpoll_interval;
codec->jackpoll_interval = msecs_to_jiffies(100); codec->jackpoll_interval = msecs_to_jiffies(100);
err = via_build_controls(codec); err = snd_hda_gen_build_controls(codec);
codec->jackpoll_interval = old_interval; codec->jackpoll_interval = old_interval;
return err; return err;
} }
@ -690,7 +645,10 @@ static int patch_vt1708(struct hda_codec *codec)
goto error; goto error;
/* add jack detect on/off control */ /* add jack detect on/off control */
spec->mixers[spec->num_mixers++] = vt1708_jack_detect_ctl; if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &vt1708_jack_detect_ctl)) {
err = -ENOMEM;
goto error;
}
spec->init_verbs[spec->num_iverbs++] = vt1708_init_verbs; spec->init_verbs[spec->num_iverbs++] = vt1708_init_verbs;
@ -967,9 +925,9 @@ static int vt1716s_dmic_put(struct snd_kcontrol *kcontrol,
return 1; return 1;
} }
static const struct snd_kcontrol_new vt1716s_dmic_mixer[] = { static const struct snd_kcontrol_new vt1716s_dmic_mixer_vol =
HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT);
{ static const struct snd_kcontrol_new vt1716s_dmic_mixer_sw = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Mic Capture Switch", .name = "Digital Mic Capture Switch",
.subdevice = HDA_SUBDEV_NID_FLAG | 0x26, .subdevice = HDA_SUBDEV_NID_FLAG | 0x26,
@ -977,16 +935,12 @@ static const struct snd_kcontrol_new vt1716s_dmic_mixer[] = {
.info = vt1716s_dmic_info, .info = vt1716s_dmic_info,
.get = vt1716s_dmic_get, .get = vt1716s_dmic_get,
.put = vt1716s_dmic_put, .put = vt1716s_dmic_put,
},
{} /* end */
}; };
/* mono-out mixer elements */ /* mono-out mixer elements */
static const struct snd_kcontrol_new vt1716S_mono_out_mixer[] = { static const struct snd_kcontrol_new vt1716S_mono_out_mixer =
HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT);
{ } /* end */
};
static const struct hda_verb vt1716S_init_verbs[] = { static const struct hda_verb vt1716S_init_verbs[] = {
/* Enable Boost Volume backdoor */ /* Enable Boost Volume backdoor */
@ -1019,8 +973,12 @@ static int patch_vt1716S(struct hda_codec *codec)
spec->init_verbs[spec->num_iverbs++] = vt1716S_init_verbs; spec->init_verbs[spec->num_iverbs++] = vt1716S_init_verbs;
spec->mixers[spec->num_mixers++] = vt1716s_dmic_mixer; if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &vt1716s_dmic_mixer_vol) ||
spec->mixers[spec->num_mixers++] = vt1716S_mono_out_mixer; !snd_hda_gen_add_kctl(&spec->gen, NULL, &vt1716s_dmic_mixer_sw) ||
!snd_hda_gen_add_kctl(&spec->gen, NULL, &vt1716S_mono_out_mixer)) {
err = -ENOMEM;
goto error;
}
return 0; return 0;