Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 335ca471 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: sirf-audio-codec: Replace w->codec snd_soc_dapm_to_codec(w->dapm) 



The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.

While we are at it also replace dev_get_drvdata() with snd_soc_codec_get_drvdata().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e

sound/soc/codecs/sirf-audio-codec.c

+4 −2
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ static int atlas6_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, 
{

#define ATLAS6_CODEC_ENABLE_BITS (1 << 29)

#define ATLAS6_CODEC_RESET_BITS (1 << 28)

	struct sirf_audio_codec *sirf_audio_codec = dev_get_drvdata(w->codec->dev);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		enable_and_reset_codec(sirf_audio_codec->regmap,
@@ -142,7 +143,8 @@ static int prima2_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, 
{

#define PRIMA2_CODEC_ENABLE_BITS (1 << 27)

#define PRIMA2_CODEC_RESET_BITS (1 << 26)

	struct sirf_audio_codec *sirf_audio_codec = dev_get_drvdata(w->codec->dev);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		enable_and_reset_codec(sirf_audio_codec->regmap,