ASoC: wm5100/wm8903/wm8996: Replace open-coded snd_soc_dapm_to_codec()
Subsystems (3)
PATCH 1/1 ASoC: wm5100/wm8903/wm8996: Replace open-coded snd_soc_dapm_to_codec()
We now have a generic helper function to cast from a DAPM context to a CODEC. Make use of it in the places which previously open-coded it.
Signed-off-by Lars-Peter Clausen <[email protected]>
--- sound/soc/codecs/wm5100.c | 3 +-- sound/soc/codecs/wm8903.c | 3 +-- sound/soc/codecs/wm8996.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
sound/soc/codecs/wm5100.c +1 -2
@@ -735,8 +735,7 @@ WM5100_MIXER_CONTROLS("LHPF4", WM5100_HPLP4MIX_INPUT_1_SOURCE),static void wm5100_seq_notifier (struct snd_soc_dapm_context *dapm,enum snd_soc_dapm_type event,int subseq) { -struct snd_soc_codec *codec =container_of (dapm, - struct snd_soc_codec, dapm); +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (dapm);struct wm5100_priv *wm5100 =snd_soc_codec_get_drvdata (codec);u16 val, expect, i;
sound/soc/codecs/wm8903.c +1 -2
@@ -281,8 +281,7 @@ static int wm8903_dcs_event(struct snd_soc_dapm_widget *w,static void wm8903_seq_notifier (struct snd_soc_dapm_context *dapm,enum snd_soc_dapm_type event,int subseq) { -struct snd_soc_codec *codec =container_of (dapm, - struct snd_soc_codec, dapm); +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (dapm);struct wm8903_priv *wm8903 =snd_soc_codec_get_drvdata (codec);int dcs_mode =WM8903_DCS_MODE_WRITE_STOP ;int i, val;
sound/soc/codecs/wm8996.c +1 -2
@@ -690,8 +690,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)static void wm8996_seq_notifier (struct snd_soc_dapm_context *dapm,enum snd_soc_dapm_type event,int subseq) { -struct snd_soc_codec *codec =container_of (dapm, - struct snd_soc_codec, dapm); +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (dapm);struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec);u16 val, mask;
Signature · 1 line
1.8.0
Quoted 5 lines · Lars-Peter Clausen
We now have a generic helper function to cast from a DAPM context to a CODEC. Make use of it in the places which previously open-coded it.
Signed-off-by Lars-Peter Clausen <[email protected]>---
Acked-by Charles Keepax <[email protected]>
Thanks,
Charles
Quoted 2 lines · Lars-Peter Clausen
We now have a generic helper function to cast from a DAPM context to a CODEC. Make use of it in the places which previously open-coded it.
Applied, thanks.