ASoC: meson: Use snd_soc_substream_to_rtd() for accessing private_data

krzk · broonie · commit 22f5680a9cbc · 2024-05-06T23:59:55.000+09:00
Do not open-code snd_soc_substream_to_rtd(). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20240430-asoc-snd-substream-clean-v1-11-6f8a8902b479@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c
@@ -25,7 +25,7 @@
 
 static struct snd_soc_dai *aiu_fifo_dai(struct snd_pcm_substream *ss)
 {
-	struct snd_soc_pcm_runtime *rtd = ss->private_data;
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss);
 
 	return snd_soc_rtd_to_cpu(rtd, 0);
 }
diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
@@ -46,7 +46,7 @@ static struct snd_pcm_hardware axg_fifo_hw = {
 
 static struct snd_soc_dai *axg_fifo_dai(struct snd_pcm_substream *ss)
 {
-	struct snd_soc_pcm_runtime *rtd = ss->private_data;
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss);
 
 	return snd_soc_rtd_to_cpu(rtd, 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`static struct snd_soc_dai aiu_fifo_dai(struct snd_pcm_substream ss)`
`27`	`27`	`{`
`28`		`- struct snd_soc_pcm_runtime *rtd = ss->private_data;`
	`28`	`+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss);`
`29`	`29`
`30`	`30`	`return snd_soc_rtd_to_cpu(rtd, 0);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static struct snd_pcm_hardware axg_fifo_hw = {`
`46`	`46`
`47`	`47`	`static struct snd_soc_dai axg_fifo_dai(struct snd_pcm_substream ss)`
`48`	`48`	`{`
`49`		`- struct snd_soc_pcm_runtime *rtd = ss->private_data;`
	`49`	`+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss);`
`50`	`50`
`51`	`51`	`return snd_soc_rtd_to_cpu(rtd, 0);`
`52`	`52`	`}`