Unverified Commit 28ec78b0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: sh: 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/87mu3v0yuj.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/sh/dma-sh7760.c

+6 −6
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void camelot_rxdma(void *data) 
static int camelot_pcm_open(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;

	int ret, dmairq;
@@ -152,7 +152,7 @@ static int camelot_pcm_open(struct snd_soc_component *component, 
static int camelot_pcm_close(struct snd_soc_component *component,

			     struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;

	int dmairq;
@@ -174,7 +174,7 @@ static int camelot_hw_params(struct snd_soc_component *component, 
			     struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *hw_params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;

	int ret;
@@ -193,7 +193,7 @@ static int camelot_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 = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];



	pr_debug("PCM data: addr 0x%08lx len %d\n",
@@ -241,7 +241,7 @@ static inline void dmabrg_rec_dma_stop(struct camelot_pcm *cam) 
static int camelot_trigger(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
@@ -269,7 +269,7 @@ static snd_pcm_uframes_t camelot_pos(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 = asoc_substream_to_rtd(substream);

	struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];

	int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;

	unsigned long pos;

sound/soc/sh/fsi.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int fsi_is_play(struct snd_pcm_substream *substream) 


static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);



	return  asoc_rtd_to_cpu(rtd, 0);

}

sound/soc/sh/migor.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct clk_lookup *siumckb_lookup; 
static int migor_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);

	int ret;

	unsigned int rate = params_rate(params);
@@ -78,7 +78,7 @@ static int migor_hw_params(struct snd_pcm_substream *substream, 


static int migor_hw_free(struct snd_pcm_substream *substream)

{

	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);



	if (use_count) {

sound/soc/sh/rcar/core.c

+2 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void rsnd_dai_stream_quit(struct rsnd_dai_stream *io) 
static

struct snd_soc_dai *rsnd_substream_to_dai(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);



	return  asoc_rtd_to_cpu(rtd, 0);

}
@@ -1399,7 +1399,7 @@ static int rsnd_hw_params(struct snd_soc_component *component, 
	struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);

	struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);

	struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);

	struct snd_soc_pcm_runtime *fe = substream->private_data;

	struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);



	/*

	 * rsnd assumes that it might be used under DPCM if user want to use

CRA Git | Maintained and supported by SUSTech CRA and CCSE