From 163bf191d3f4f1609e33e5058d29dafa90249e3d Mon Sep 17 00:00:00 2001 From: Ravindra Lokhande Date: Thu, 9 Jul 2015 15:41:13 +0530 Subject: [PATCH] ASoC: tegra-alt: use snd_soc_kcontrol_codec to access codec use snd_soc_kcontrol_codec to get access to codec instance instead of snd_kcontrol_chip. Change-Id: Iadad5689aed636f2f6ceed76c46e795c3054a30c Signed-off-by: Ravindra Lokhande Reviewed-on: http://git-master/r/768400 Reviewed-by: Viraj Karandikar Reviewed-by: Bharat Nihalani --- sound/soc/tegra-alt/tegra210_amx_alt.c | 4 ++-- sound/soc/tegra-alt/tegra210_sfc_alt.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_amx_alt.c b/sound/soc/tegra-alt/tegra210_amx_alt.c index 23d70129..c0e6d5ac 100644 --- a/sound/soc/tegra-alt/tegra210_amx_alt.c +++ b/sound/soc/tegra-alt/tegra210_amx_alt.c @@ -460,7 +460,7 @@ static int tegra210_amx_set_channel_map(struct snd_soc_dai *dai, static int tegra210_amx_get_byte_map(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; struct tegra210_amx *amx = snd_soc_codec_get_drvdata(codec); @@ -475,7 +475,7 @@ static int tegra210_amx_put_byte_map(struct snd_kcontrol *kcontrol, { struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct tegra210_amx *amx = snd_soc_codec_get_drvdata(codec); int reg = mc->reg; int value = ucontrol->value.integer.value[0]; diff --git a/sound/soc/tegra-alt/tegra210_sfc_alt.c b/sound/soc/tegra-alt/tegra210_sfc_alt.c index db9f2195..f1abe278 100644 --- a/sound/soc/tegra-alt/tegra210_sfc_alt.c +++ b/sound/soc/tegra-alt/tegra210_sfc_alt.c @@ -450,7 +450,7 @@ static int tegra210_sfc_put_srate(struct snd_kcontrol *kcontrol, static int tegra210_sfc_get_format(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct tegra210_sfc *sfc = snd_soc_codec_get_drvdata(codec); /* get the format control flag */ @@ -463,7 +463,7 @@ static int tegra210_sfc_get_format(struct snd_kcontrol *kcontrol, static int tegra210_sfc_put_format(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct tegra210_sfc *sfc = snd_soc_codec_get_drvdata(codec); /* set the format control flag */ @@ -482,7 +482,7 @@ static int tegra210_sfc_init_get(struct snd_kcontrol *kcontrol, static int tegra210_sfc_init_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct tegra210_sfc *sfc = snd_soc_codec_get_drvdata(codec); int init = ucontrol->value.enumerated.item[0]; int ret = 0;