Unverified Commit 2ab9a409 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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


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

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream) 
{

	struct sst_runtime_stream *stream =

			substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int ret_val;



	dev_dbg(rtd->dev, "setting buffer ptr param\n");
@@ -582,7 +582,7 @@ static int sst_soc_trigger(struct snd_soc_component *component, 
	int ret_val = 0, str_id;

	struct sst_runtime_stream *stream;

	int status;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);



	dev_dbg(rtd->dev, "%s called\n", __func__);

	if (substream->pcm->internal)
@@ -630,7 +630,7 @@ static snd_pcm_uframes_t sst_soc_pointer(struct snd_soc_component *component, 
	struct sst_runtime_stream *stream;

	int ret_val, status;

	struct pcm_stream_info *str_info;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);



	stream = substream->runtime->private_data;

	status = sst_get_stream_status(stream);

sound/soc/intel/baytrail/sst-baytrail-pcm.c

+8 −8
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int sst_byt_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 sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -121,7 +121,7 @@ static int sst_byt_pcm_hw_params(struct snd_soc_component *component, 


static int sst_byt_pcm_restore_stream_context(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, DRV_NAME);

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
@@ -155,7 +155,7 @@ static void sst_byt_pcm_work(struct work_struct *work) 
static int sst_byt_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 sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -197,7 +197,7 @@ static u32 byt_notify_pointer(struct sst_byt_stream *stream, void *data) 
	struct sst_byt_pcm_data *pcm_data = data;

	struct snd_pcm_substream *substream = pcm_data->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 snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt *byt = pdata->byt;
@@ -219,7 +219,7 @@ static u32 byt_notify_pointer(struct sst_byt_stream *stream, void *data) 
static snd_pcm_uframes_t sst_byt_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_pcm_runtime *runtime = substream->runtime;

	struct sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
@@ -232,7 +232,7 @@ static snd_pcm_uframes_t sst_byt_pcm_pointer(struct snd_soc_component *component 
static int sst_byt_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 sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -260,7 +260,7 @@ static int sst_byt_pcm_open(struct snd_soc_component *component, 
static int sst_byt_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 sst_byt_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];

	struct sst_byt *byt = pdata->byt;
@@ -286,7 +286,7 @@ static int sst_byt_pcm_mmap(struct snd_soc_component *component, 
			    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);



	dev_dbg(rtd->dev, "PCM: mmap\n");

	return snd_pcm_lib_default_mmap(substream, vma);

sound/soc/intel/haswell/sst-haswell-pcm.c

+6 −6
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int hsw_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 hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct hsw_pcm_data *pcm_data;
@@ -652,7 +652,7 @@ static int hsw_pcm_hw_params(struct snd_soc_component *component, 
static int hsw_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 hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct hsw_pcm_data *pcm_data;

	struct sst_hsw_stream *sst_stream;
@@ -695,7 +695,7 @@ static u32 hsw_notify_pointer(struct sst_hsw_stream *stream, void *data) 
	struct hsw_pcm_data *pcm_data = data;

	struct snd_pcm_substream *substream = pcm_data->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 snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);

	struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct sst_hsw *hsw = pdata->hsw;
@@ -760,7 +760,7 @@ static u32 hsw_notify_pointer(struct sst_hsw_stream *stream, void *data) 
static snd_pcm_uframes_t hsw_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_pcm_runtime *runtime = substream->runtime;

	struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct hsw_pcm_data *pcm_data;
@@ -785,7 +785,7 @@ static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_soc_component *component, 
static int hsw_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 hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct hsw_pcm_data *pcm_data;

	struct sst_hsw *hsw = pdata->hsw;
@@ -818,7 +818,7 @@ static int hsw_pcm_open(struct snd_soc_component *component, 
static int hsw_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 hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);

	struct hsw_pcm_data *pcm_data;

	struct sst_hsw *hsw = pdata->hsw;

sound/soc/intel/keembay/kmb_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int kmb_pcm_open(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 kmb_i2s_info *kmb_i2s;



	kmb_i2s = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

sound/soc/intel/skylake/skl-pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int skl_link_hw_params(struct snd_pcm_substream *substream, 
{

	struct hdac_bus *bus = dev_get_drvdata(dai->dev);

	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 skl_pipe_params p_params = {0};

	struct hdac_ext_link *link;
@@ -634,7 +634,7 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream, 
		struct snd_soc_dai *dai)

{

	struct hdac_bus *bus = dev_get_drvdata(dai->dev);

	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct hdac_ext_stream *link_dev =

				snd_soc_dai_get_dma_data(dai, substream);

	struct hdac_ext_link *link;
@@ -1071,7 +1071,7 @@ int skl_dai_load(struct snd_soc_component *cmp, int index, 
static int skl_platform_soc_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_soc_dai_link *dai_link = rtd->dai_link;



	dev_dbg(asoc_rtd_to_cpu(rtd, 0)->dev, "In %s:%s\n", __func__,
@@ -1225,7 +1225,7 @@ static int skl_platform_soc_mmap(struct snd_soc_component *component, 
static u64 skl_adjust_codec_delay(struct snd_pcm_substream *substream,

				u64 nsec)

{

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

	u64 codec_frames, codec_nsecs;