mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 04:04:43 +01:00
ASoC: codecs: cros_ec: use snd_kcontrol_chip() instead of snd_soc_kcontrol_component()
We have very similar name functions (A)(B). Both gets component from snd_kcontrol, but (A) is used in callback functions which is registered through snd_soc_add_component_controls(), (B) is used through snd_soc_dapm_new_widgets(). (A) snd_soc_kcontrol_component() (B) snd_soc_dapm_kcontrol_component() (B) is using very picky way to get component but using it is necessary in ASoC. But (A) is just wrapper function to snd_kcontrol_chip(), and directly using it without wrapper is very common way on ALSA. To reduce confusions of similar function, let's use common way on (A). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/877bwyt8q8.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
fd27a636d3
commit
f2b55e5671
1 changed files with 4 additions and 6 deletions
|
|
@ -108,8 +108,7 @@ error:
|
|||
static int dmic_get_gain(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_component *component =
|
||||
snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
|
||||
struct cros_ec_codec_priv *priv =
|
||||
snd_soc_component_get_drvdata(component);
|
||||
struct ec_param_ec_codec_dmic p;
|
||||
|
|
@ -140,8 +139,7 @@ static int dmic_get_gain(struct snd_kcontrol *kcontrol,
|
|||
static int dmic_put_gain(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_component *component =
|
||||
snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
|
||||
struct cros_ec_codec_priv *priv =
|
||||
snd_soc_component_get_drvdata(component);
|
||||
struct soc_mixer_control *control =
|
||||
|
|
@ -633,7 +631,7 @@ leave:
|
|||
static int wov_enable_get(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
|
||||
struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(c);
|
||||
|
||||
ucontrol->value.integer.value[0] = priv->wov_enabled;
|
||||
|
|
@ -643,7 +641,7 @@ static int wov_enable_get(struct snd_kcontrol *kcontrol,
|
|||
static int wov_enable_put(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
|
||||
struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
|
||||
struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(c);
|
||||
int enabled = ucontrol->value.integer.value[0];
|
||||
struct ec_param_ec_codec_wov p;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue