Skip to content

Commit

Permalink
ASoC: wm8997: Replace direct snd_soc_codec dapm field access
Browse files Browse the repository at this point in the history
The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to codec->dapm
with snd_soc_codec_get_dapm().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Jun 1, 2015
1 parent 6a141e4 commit 8383dfd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/soc/codecs/wm8997.c
Original file line number Diff line number Diff line change
Expand Up @@ -1055,13 +1055,14 @@ static struct snd_soc_dai_driver wm8997_dai[] = {

static int wm8997_codec_probe(struct snd_soc_codec *codec)
{
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);

arizona_init_spk(codec);

snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
snd_soc_dapm_disable_pin(dapm, "HAPTICS");

priv->core.arizona->dapm = &codec->dapm;
priv->core.arizona->dapm = dapm;

return 0;
}
Expand Down

0 comments on commit 8383dfd

Please sign in to comment.