ASoC: codecs: wcd9335: 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/87347mp0sp.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index 1c050b8c19de43cf494583d2c96f50f65aefe567..5485c558b879d01c61330958fcd0bedeeee02820 100644 (file)
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -2177,7 +2177,7 @@ static int wcd9335_get_compander(struct snd_kcontrol *kc,
                               struct snd_ctl_elem_value *ucontrol)
 {
 
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kc);
+       struct snd_soc_component *component = snd_kcontrol_chip(kc);
        int comp = ((struct soc_mixer_control *)kc->private_value)->shift;
        struct wcd9335_codec *wcd = dev_get_drvdata(component->dev);
 
@@ -2188,7 +2188,7 @@ static int wcd9335_get_compander(struct snd_kcontrol *kc,
 static int wcd9335_set_compander(struct snd_kcontrol *kc,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kc);
+       struct snd_soc_component *component = snd_kcontrol_chip(kc);
        struct wcd9335_codec *wcd = dev_get_drvdata(component->dev);
        int comp = ((struct soc_mixer_control *) kc->private_value)->shift;
        int value = ucontrol->value.integer.value[0];
@@ -2227,7 +2227,7 @@ static int wcd9335_set_compander(struct snd_kcontrol *kc,
 static int wcd9335_rx_hph_mode_get(struct snd_kcontrol *kc,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kc);
+       struct snd_soc_component *component = snd_kcontrol_chip(kc);
        struct wcd9335_codec *wcd = dev_get_drvdata(component->dev);
 
        ucontrol->value.enumerated.item[0] = wcd->hph_mode;
@@ -2238,7 +2238,7 @@ static int wcd9335_rx_hph_mode_get(struct snd_kcontrol *kc,
 static int wcd9335_rx_hph_mode_put(struct snd_kcontrol *kc,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kc);
+       struct snd_soc_component *component = snd_kcontrol_chip(kc);
        struct wcd9335_codec *wcd = dev_get_drvdata(component->dev);
        u32 mode_val;