Unverified Commit 0ceef681 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-xxx: add asoc_substream_to_rtd() 



Current soc-xxx are getting rtd from substream by

	rtd = substream->private_data;

But, getting data from "private_data" is very unclear.
This patch adds asoc_substream_to_rtd() macro which is
easy to understand that rtd from substream.

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


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

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,8 @@ struct snd_soc_pcm_runtime { 
/* see soc_new_pcm_runtime()  */

#define asoc_rtd_to_cpu(rtd, n)   (rtd)->dais[n]

#define asoc_rtd_to_codec(rtd, n) (rtd)->dais[n + (rtd)->num_cpus]

#define asoc_substream_to_rtd(substream) \

	(struct snd_soc_pcm_runtime *)snd_pcm_substream_chip(substream)



#define for_each_rtd_components(rtd, i, component)			\

	for ((i) = 0, component = NULL;					\

sound/soc/soc-component.c

+10 −10
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_test_bits); 


int snd_soc_pcm_component_pointer(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_component *component;

	int i;
@@ -621,7 +621,7 @@ int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream) 
int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,

				unsigned int cmd, void *arg)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	int i;
@@ -638,7 +638,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, 


int snd_soc_pcm_component_sync_stop(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_component *component;

	int i, ret;
@@ -658,7 +658,7 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, 
				    int channel, unsigned long pos,

				    void __user *buf, unsigned long bytes)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	int i;
@@ -677,7 +677,7 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, 
struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,

					unsigned long offset)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	struct page *page;

	int i;
@@ -698,7 +698,7 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, 
int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,

			       struct vm_area_struct *vma)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	int i;
@@ -745,7 +745,7 @@ void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd) 


int snd_soc_pcm_component_prepare(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_component *component;

	int i, ret;
@@ -764,7 +764,7 @@ int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream, 
				    struct snd_pcm_hw_params *params,

				    struct snd_soc_component **last)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	int i, ret;
@@ -786,7 +786,7 @@ int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream, 
void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream,

				   struct snd_soc_component *last)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component;

	int i, ret;
@@ -805,7 +805,7 @@ void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream, 
int snd_soc_pcm_component_trigger(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 snd_soc_component *component;

	int i, ret;

sound/soc/soc-dai.c

+4 −4
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai, 
			  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);

	int ret = 0;



	/* perform any topology hw_params fixups before DAI  */
@@ -516,7 +516,7 @@ int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd) 


int snd_soc_pcm_dai_prepare(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 *dai;

	int i, ret;
@@ -535,7 +535,7 @@ int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream) 
int snd_soc_pcm_dai_trigger(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 snd_soc_dai *dai;

	int i, ret;
@@ -554,7 +554,7 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, 
int snd_soc_pcm_dai_bespoke_trigger(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 snd_soc_dai *dai;

	int i, ret;

sound/soc/soc-dapm.c

+3 −3
Original line number Diff line number Diff line
@@ -2673,7 +2673,7 @@ int snd_soc_dapm_update_dai(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);

	int ret;



	mutex_lock_nested(&rtd->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
@@ -3795,7 +3795,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_dapm_path *path;

	struct snd_soc_dai *source, *sink;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_pcm_hw_params *params = NULL;

	const struct snd_soc_pcm_stream *config = NULL;

	struct snd_pcm_runtime *runtime = NULL;
@@ -4117,7 +4117,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, 
		     struct snd_pcm_substream *substream,

		     char *id)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dapm_widget template;

	struct snd_soc_dapm_widget *w;

	const char **w_param_text;

sound/soc/soc-generic-dmaengine-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm, 
int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_dmaengine_dai_dma_data *dma_data;

	int ret;
@@ -105,7 +105,7 @@ static int 
dmaengine_pcm_set_runtime_hwparams(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 dmaengine_pcm *pcm = soc_component_to_pcm(component);

	struct device *dma_dev = dmaengine_dma_dev(pcm, substream);

	struct dma_chan *chan = pcm->chan[substream->stream];