Unverified Commit d98b0712 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use snd_soc_substream_to_rtd() for accessing 

Merge series from Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>:

Do not open-code snd_soc_substream_to_rtd() when accessing
snd_pcm_substream->private_data.  This makes code more consistent with
rest of ASoC and allows in the future to move the field to any other
place or add additional checks in snd_soc_substream_to_rtd().
parents ba04ff20 47aa5167

sound/arm/pxa2xx-pcm-lib.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *params)

{

	struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_dmaengine_dai_dma_data *dma_params;

	struct dma_slave_config config;

	int ret;
@@ -79,7 +79,7 @@ EXPORT_SYMBOL(pxa2xx_pcm_prepare); 


int pxa2xx_pcm_open(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 snd_pcm_runtime *runtime = substream->runtime;

	struct snd_dmaengine_dai_dma_data *dma_params;

	int ret;

sound/soc/amd/acp/acp-mach-common.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static void acp_card_shutdown(struct snd_pcm_substream *substream) 
static int acp_card_rt5682_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 acp_card_drvdata *drvdata = card->drvdata;

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

sound/soc/amd/acp3x-rt5682-max9836.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int rt5682_clk_enable(struct snd_pcm_substream *substream) 
static int acp3x_1015_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 *codec_dai;

	int srate, i, ret;

sound/soc/amd/ps/ps-sdw-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int acp63_sdw_dma_open(struct snd_soc_component *component, 
	struct acp_sdw_dma_stream *stream;

	struct snd_soc_dai *cpu_dai;

	struct amd_sdw_manager *amd_manager;

	struct snd_soc_pcm_runtime *prtd = substream->private_data;

	struct snd_soc_pcm_runtime *prtd = snd_soc_substream_to_rtd(substream);

	int ret;



	runtime = substream->runtime;

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;