Unverified Commit 9f5f078a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: use asoc_substream_to_rtd() 



Now we can use asoc_substream_to_rtd() macro,
let's use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87eep70ytr.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/eukrea-tlv320.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
static int eukrea_tlv320_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 = asoc_substream_to_rtd(substream);

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

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

	int ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static bool fsl_asoc_card_is_ac97(struct fsl_asoc_card_priv *priv) 
static int fsl_asoc_card_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 = asoc_substream_to_rtd(substream);

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

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	struct cpu_priv *cpu_priv = &priv->cpu_priv;

sound/soc/fsl/fsl_asrc_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, 
				  struct snd_pcm_hw_params *params)

{

	enum dma_slave_buswidth buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	struct snd_dmaengine_dai_dma_data *dma_params_fe = NULL;

	struct snd_dmaengine_dai_dma_data *dma_params_be = NULL;
@@ -313,7 +313,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component, 
				struct snd_pcm_substream *substream)

{

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_dmaengine_dai_dma_data *dma_data;

	struct device *dev = component->dev;

sound/soc/fsl/fsl_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static irqreturn_t fsl_dma_isr(int irq, void *dev_id) 
{

	struct fsl_dma_private *dma_private = dev_id;

	struct snd_pcm_substream *substream = dma_private->substream;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct device *dev = rtd->dev;

	struct ccsr_dma_channel __iomem *dma_channel = dma_private->dma_channel;

	irqreturn_t ret = IRQ_NONE;

sound/soc/fsl/fsl_spdif.c

+5 −5
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int spdif_set_rx_clksrc(struct fsl_spdif_priv *spdif_priv, 
static int spdif_set_sample_rate(struct snd_pcm_substream *substream,

				int sample_rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control;

	struct regmap *regmap = spdif_priv->regmap;
@@ -492,7 +492,7 @@ clk_set_bypass: 
static int fsl_spdif_startup(struct snd_pcm_substream *substream,

			     struct snd_soc_dai *cpu_dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct platform_device *pdev = spdif_priv->pdev;

	struct regmap *regmap = spdif_priv->regmap;
@@ -534,7 +534,7 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream, 
static void fsl_spdif_shutdown(struct snd_pcm_substream *substream,

				struct snd_soc_dai *cpu_dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct regmap *regmap = spdif_priv->regmap;

	u32 scr, mask;
@@ -563,7 +563,7 @@ static int fsl_spdif_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 = asoc_substream_to_rtd(substream);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control;

	struct platform_device *pdev = spdif_priv->pdev;
@@ -591,7 +591,7 @@ static int fsl_spdif_hw_params(struct snd_pcm_substream *substream, 
static int fsl_spdif_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 = asoc_substream_to_rtd(substream);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct regmap *regmap = spdif_priv->regmap;

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE