diff mbox

ASoC: wm5102: Convert snd_kcontrol_chip to snd_soc_kcontrol_codec

Message ID 1402487458-18957-1-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive)
State Accepted
Commit 5c3fc7a79aae474670096d73da21aec9f0750abb
Headers show

Commit Message

Charles Keepax June 11, 2014, 11:50 a.m. UTC 
Controls for shaping the ultrasonic frequency response were introduced
in this commit:

commit 720630c002ffc7b0fa2ed5b3f4bfb36fd8f87ca6
ASoC: wm5102: Add controls to allow shaping of ultrasonic response

However, they mistakenly used snd_kcontrol_chip instead of
snd_soc_kcontrol_codec, which has replaced it now the framework is
moving to componentisation. This patch fixes this.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm5102.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Comments

Mark Brown June 11, 2014, 11:35 p.m. UTC | #1 
On Wed, Jun 11, 2014 at 12:50:58PM +0100, Charles Keepax wrote:
> Controls for shaping the ultrasonic frequency response were introduced
> in this commit:

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 8613504..fa24d55 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -615,7 +615,7 @@  static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
 static int wm5102_out_comp_coeff_get(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 arizona *arizona = dev_get_drvdata(codec->dev->parent);
 	uint16_t data;
 
@@ -630,7 +630,7 @@  static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol,
 static int wm5102_out_comp_coeff_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 arizona *arizona = dev_get_drvdata(codec->dev->parent);
 
 	mutex_lock(&codec->mutex);
@@ -645,7 +645,7 @@  static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol,
 static int wm5102_out_comp_switch_get(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 arizona *arizona = dev_get_drvdata(codec->dev->parent);
 
 	mutex_lock(&codec->mutex);
@@ -658,7 +658,7 @@  static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol,
 static int wm5102_out_comp_switch_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 arizona *arizona = dev_get_drvdata(codec->dev->parent);
 
 	mutex_lock(&codec->mutex);