Unverified Commit b695d8be authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: fsl: Use snd_soc_substream_to_rtd() for accessing private_data 



Do not open-code snd_soc_substream_to_rtd().

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240430-asoc-snd-substream-clean-v1-6-6f8a8902b479@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a84d8407

sound/soc/fsl/fsl-asoc-card.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, 


static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct codec_priv *codec_priv = &priv->codec_priv;

	struct device *dev = rtd->card->dev;

sound/soc/fsl/imx-card.c

+3 −3
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static unsigned long akcodec_get_mclk_rate(struct snd_pcm_substream *substream, 
					   struct snd_pcm_hw_params *params,

					   int slots, int slot_width)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct imx_card_data *data = snd_soc_card_get_drvdata(rtd->card);

	const struct imx_card_plat_data *plat_data = data->plat_data;

	struct dai_link_data *link_data = &data->link_data[rtd->num];
@@ -289,7 +289,7 @@ static unsigned long akcodec_get_mclk_rate(struct snd_pcm_substream *substream, 
static int imx_aif_hw_params(struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct snd_soc_card *card = rtd->card;

	struct imx_card_data *data = snd_soc_card_get_drvdata(card);
@@ -405,7 +405,7 @@ static int ak5558_hw_rule_rate(struct snd_pcm_hw_params *p, struct snd_pcm_hw_ru 
static int imx_aif_startup(struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_card *card = rtd->card;

	struct imx_card_data *data = snd_soc_card_get_drvdata(card);

	struct dai_link_data *link_data = &data->link_data[rtd->num];

sound/soc/fsl/imx-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct imx_hdmi_data { 
static int imx_hdmi_hw_params(struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct imx_hdmi_data *data = snd_soc_card_get_drvdata(rtd->card);

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

sound/soc/fsl/imx-pcm-rpmsg.c

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int imx_rpmsg_pcm_prepare(struct snd_soc_component *component, 
				 struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev);
@@ -461,7 +461,7 @@ static int imx_rpmsg_pcm_trigger(struct snd_soc_component *component, 
				 struct snd_pcm_substream *substream, int cmd)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev);

	int ret = 0;
@@ -515,7 +515,7 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component, 
			     struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct fsl_rpmsg *rpmsg = dev_get_drvdata(cpu_dai->dev);

	struct rpmsg_info *info = dev_get_drvdata(component->dev);