Unverified Commit 1205300a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: sof: 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>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87o8ob0yun.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/sof/intel/hda-dai.c

+5 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct hdac_ext_stream * 
	hda_link_stream_assign(struct hdac_bus *bus,

			       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 sof_intel_hda_stream *hda_stream;

	struct hdac_ext_stream *res = NULL;

	struct hdac_stream *stream = NULL;
@@ -203,7 +203,7 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, 
	struct hdac_stream *hstream = substream->runtime->private_data;

	struct hdac_bus *bus = hstream->bus;

	struct hdac_ext_stream *link_dev;

	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

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

	struct sof_intel_hda_stream *hda_stream;

	struct hda_pipe_params p_params = {0};
@@ -264,7 +264,7 @@ static int hda_link_pcm_prepare(struct snd_pcm_substream *substream, 
				snd_soc_dai_get_dma_data(dai, substream);

	struct snd_sof_dev *sdev =

				snd_soc_component_get_drvdata(dai->component);

	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int stream = substream->stream;



	if (link_dev->link_prepared)
@@ -291,7 +291,7 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream, 


	hstream = substream->runtime->private_data;

	bus = hstream->bus;

	rtd = snd_pcm_substream_chip(substream);

	rtd = asoc_substream_to_rtd(substream);



	link = snd_hdac_ext_bus_get_link(bus, asoc_rtd_to_codec(rtd, 0)->component->name);

	if (!link)
@@ -357,7 +357,7 @@ static int hda_link_hw_free(struct snd_pcm_substream *substream, 


	hstream = substream->runtime->private_data;

	bus = hstream->bus;

	rtd = snd_pcm_substream_chip(substream);

	rtd = asoc_substream_to_rtd(substream);

	link_dev = snd_soc_dai_get_dma_data(dai, substream);



	if (!link_dev) {

sound/soc/sof/intel/hda-dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) 
		 * explicitly during suspend.

		 */

		if (stream->link_substream) {

			rtd = snd_pcm_substream_chip(stream->link_substream);

			rtd = asoc_substream_to_rtd(stream->link_substream);

			name = asoc_rtd_to_codec(rtd, 0)->component->name;

			link = snd_hdac_ext_bus_get_link(bus, name);

			if (!link)

sound/soc/sof/intel/hda-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int hda_dsp_pcm_trigger(struct snd_sof_dev *sdev, 
snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev,

				      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 *scomp = sdev->component;

	struct hdac_stream *hstream = substream->runtime->private_data;

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

sound/soc/sof/pcm.c

+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int create_page_table(struct snd_soc_component *component, 
			     struct snd_pcm_substream *substream,

			     unsigned char *dma_area, size_t size)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_sof_pcm *spcm;

	struct snd_dma_buffer *dmab = snd_pcm_get_dma_buf(substream);

	int stream = substream->stream;
@@ -71,7 +71,7 @@ void snd_sof_pcm_period_elapsed_work(struct work_struct *work) 
 */

void snd_sof_pcm_period_elapsed(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 =

		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);

	struct snd_sof_pcm *spcm;
@@ -120,7 +120,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, 
			     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_pcm_runtime *runtime = substream->runtime;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;
@@ -237,7 +237,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, 
static int sof_pcm_hw_free(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 snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	int ret, err = 0;
@@ -273,7 +273,7 @@ static int sof_pcm_hw_free(struct snd_soc_component *component, 
static int sof_pcm_prepare(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 snd_sof_pcm *spcm;

	int ret;
@@ -310,7 +310,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component, 
static int sof_pcm_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 snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	struct sof_ipc_stream stream;
@@ -423,7 +423,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component, 
static snd_pcm_uframes_t sof_pcm_pointer(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 snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	snd_pcm_uframes_t host, dai;
@@ -456,7 +456,7 @@ static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, 
static int sof_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 snd_pcm_runtime *runtime = substream->runtime;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	const struct snd_sof_dsp_ops *ops = sof_ops(sdev);
@@ -528,7 +528,7 @@ static int sof_pcm_open(struct snd_soc_component *component, 
static int sof_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 snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE