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

ASoC: mediatek: 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-10-6f8a8902b479@linaro.org


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

sound/soc/mediatek/mt7986/mt7986-afe-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const struct snd_pcm_hardware mt7986_afe_hardware = { 
static int mt7986_memif_fs(struct snd_pcm_substream *substream,

			   unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
@@ -116,7 +116,7 @@ static int mt7986_memif_fs(struct snd_pcm_substream *substream, 
static int mt7986_irq_fs(struct snd_pcm_substream *substream,

			 unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);

sound/soc/mediatek/mt8186/mt8186-afe-pcm.c

+7 −7
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const struct snd_pcm_hardware mt8186_afe_hardware = { 
static int mt8186_fe_startup(struct snd_pcm_substream *substream,

			     struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct snd_pcm_runtime *runtime = substream->runtime;

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;
@@ -82,7 +82,7 @@ static int mt8186_fe_startup(struct snd_pcm_substream *substream, 
static void mt8186_fe_shutdown(struct snd_pcm_substream *substream,

			       struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct mt8186_afe_private *afe_priv = afe->platform_priv;

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;
@@ -104,7 +104,7 @@ static int mt8186_fe_hw_params(struct snd_pcm_substream *substream, 
			       struct snd_pcm_hw_params *params,

			       struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;

	unsigned int channels = params_channels(params);
@@ -153,7 +153,7 @@ static int mt8186_fe_hw_free(struct snd_pcm_substream *substream, 
static int mt8186_fe_trigger(struct snd_pcm_substream *substream, int cmd,

			     struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime * const runtime = substream->runtime;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct mt8186_afe_private *afe_priv = afe->platform_priv;
@@ -252,7 +252,7 @@ static int mt8186_fe_trigger(struct snd_pcm_substream *substream, int cmd, 
static int mt8186_memif_fs(struct snd_pcm_substream *substream,

			   unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
@@ -269,7 +269,7 @@ static int mt8186_get_dai_fs(struct mtk_base_afe *afe, 


static int mt8186_irq_fs(struct snd_pcm_substream *substream, unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
@@ -290,7 +290,7 @@ static int mt8186_get_memif_pbuf_size(struct snd_pcm_substream *substream) 
static int mt8186_fe_prepare(struct snd_pcm_substream *substream,

			     struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime * const runtime = substream->runtime;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;

sound/soc/mediatek/mt8186/mt8186-mt6366.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static const struct snd_soc_ops mt8186_da7219_i2s_ops = { 
static int mt8186_rt5682s_i2s_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_card *card = rtd->card;

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

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

sound/soc/mediatek/mt8188/mt8188-afe-pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int mt8188_afe_fs_timing(unsigned int rate) 
static int mt8188_memif_fs(struct snd_pcm_substream *substream,

			   unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component = NULL;

	struct mtk_base_afe *afe = NULL;

	struct mt8188_afe_private *afe_priv = NULL;
@@ -300,7 +300,7 @@ static int mt8188_afe_enable_cm(struct mtk_base_afe *afe, 
static int mt8188_afe_fe_startup(struct snd_pcm_substream *substream,

				 struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;
@@ -334,7 +334,7 @@ static int mt8188_afe_fe_hw_params(struct snd_pcm_substream *substream, 
				   struct snd_pcm_hw_params *params,

				   struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;

	struct mtk_base_afe_memif *memif = &afe->memif[id];
@@ -358,7 +358,7 @@ static int mt8188_afe_fe_trigger(struct snd_pcm_substream *substream, int cmd, 
{

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	const struct mt8188_afe_channel_merge *cm = mt8188_afe_found_cm(dai);

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime * const runtime = substream->runtime;

	int id = snd_soc_rtd_to_cpu(rtd, 0)->id;

	struct mtk_base_afe_memif *memif = &afe->memif[id];

sound/soc/mediatek/mt8188/mt8188-mt6359.c

+3 −3
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ enum { 
static int mt8188_dptx_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);

	unsigned int rate = params_rate(params);

	unsigned int mclk_fs_ratio = 256;

	unsigned int mclk_fs = rate * mclk_fs_ratio;
@@ -658,7 +658,7 @@ static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd) 
static int mt8188_max98390_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);

	unsigned int bit_width = params_width(params);

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

	struct snd_soc_dai *codec_dai;
@@ -821,7 +821,7 @@ static const struct snd_soc_ops mt8188_nau8825_ops = { 
static int mt8188_rt5682s_i2s_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_card *card = rtd->card;

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

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);