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

Commit 1095e281 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Access driver data through platform from compressed ops 



As the compressed ops run on the platform side of things we should
really access the driver data through the platform pointer rather than
the CODEC pointer. As the compressed DAIs in our systems always connect
our CODEC to our platform this has never been an issue, but should still
be corrected. Additionally it clears the way for future core refactoring
work.

Reported-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 91495329

sound/soc/codecs/cs47l24.c

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { 
static int cs47l24_open(struct snd_compr_stream *stream)

{

	struct snd_soc_pcm_runtime *rtd = stream->private_data;

	struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);

	struct cs47l24_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);

	struct arizona *arizona = priv->core.arizona;

	int n_adsp;

sound/soc/codecs/wm5102.c

+1 −1
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { 
static int wm5102_open(struct snd_compr_stream *stream)

{

	struct snd_soc_pcm_runtime *rtd = stream->private_data;

	struct wm5102_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);

	struct wm5102_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);



	return wm_adsp_compr_open(&priv->core.adsp[0], stream);

}

sound/soc/codecs/wm5110.c

+1 −1
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ static struct snd_soc_dai_driver wm5110_dai[] = { 
static int wm5110_open(struct snd_compr_stream *stream)

{

	struct snd_soc_pcm_runtime *rtd = stream->private_data;

	struct wm5110_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);

	struct wm5110_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);

	struct arizona *arizona = priv->core.arizona;

	int n_adsp;