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

Commit 002d1c4e authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm5100: Replace direct snd_soc_codec dapm field access 



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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e566b532

sound/soc/codecs/wm5100.c

+3 −3
Original line number Diff line number Diff line
@@ -2101,7 +2101,7 @@ static void wm5100_micd_irq(struct wm5100_priv *wm5100) 
int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)

{

	struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);



	if (jack) {

		wm5100->jack = jack;
@@ -2336,6 +2336,7 @@ static void wm5100_free_gpio(struct i2c_client *i2c) 


static int wm5100_probe(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct i2c_client *i2c = to_i2c_client(codec->dev);

	struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);

	int ret, i;
@@ -2353,8 +2354,7 @@ static int wm5100_probe(struct snd_soc_codec *codec) 
	/* TODO: check if we're symmetric */



	if (i2c->irq)

		snd_soc_dapm_new_controls(&codec->dapm,

					  wm5100_dapm_widgets_noirq,

		snd_soc_dapm_new_controls(dapm, wm5100_dapm_widgets_noirq,

					  ARRAY_SIZE(wm5100_dapm_widgets_noirq));



	if (wm5100->pdata.hp_pol) {