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

diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c
index 08cc52b374a9a06df6ec563cdaed3b6fcf90e18e..bde190a659b13c83a4e1f0cb6243732fd55daaf4 100644 (file)
--- a/sound/soc/codecs/pcm6240.c
+++ b/sound/soc/codecs/pcm6240.c
@@ -1139,8 +1139,7 @@ static int pcmdevice_info_profile(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_info *uinfo)
 {
-       struct snd_soc_component *codec
-               = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
        struct pcmdevice_priv *pcm_dev =
                snd_soc_component_get_drvdata(codec);
 
@@ -1156,8 +1155,7 @@ static int pcmdevice_get_profile_id(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *codec
-               = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
        struct pcmdevice_priv *pcm_dev =
                snd_soc_component_get_drvdata(codec);
 
@@ -1170,8 +1168,7 @@ static int pcmdevice_set_profile_id(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *codec
-               = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
        struct pcmdevice_priv *pcm_dev =
                snd_soc_component_get_drvdata(codec);
        int nr_profile = ucontrol->value.integer.value[0];