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

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


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

sound/soc/qcom/apq8096.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
static int msm_snd_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);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];

sound/soc/qcom/lpass-platform.c

+7 −7
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, 
				      struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;
@@ -125,7 +125,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, 
					   struct snd_pcm_substream *substream,

					   struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -218,7 +218,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component, 
static int lpass_platform_pcmops_hw_free(struct snd_soc_component *component,

					 struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -239,7 +239,7 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component, 
					 struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -291,7 +291,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, 
					 struct snd_pcm_substream *substream,

					 int cmd)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -365,7 +365,7 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( 
		struct snd_soc_component *component,

		struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -410,7 +410,7 @@ static irqreturn_t lpass_dma_interrupt_handler( 
			struct lpass_data *drvdata,

			int chan, u32 interrupts)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);

	struct lpass_variant *v = drvdata->variant;

	irqreturn_t ret = IRQ_NONE;

	int rv;

sound/soc/qcom/qdsp6/q6asm-dai.c

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int q6asm_dai_prepare(struct snd_soc_component *component, 
			     struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;

	struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream);

	struct q6asm_dai_rtd *prtd = runtime->private_data;

	struct q6asm_dai_data *pdata;

	struct device *dev = component->dev;
@@ -333,7 +333,7 @@ static int q6asm_dai_open(struct snd_soc_component *component, 
			  struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;

	struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_prtd, 0);

	struct q6asm_dai_rtd *prtd;

	struct q6asm_dai_data *pdata;
@@ -425,7 +425,7 @@ static int q6asm_dai_close(struct snd_soc_component *component, 
			   struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;

	struct snd_soc_pcm_runtime *soc_prtd = asoc_substream_to_rtd(substream);

	struct q6asm_dai_rtd *prtd = runtime->private_data;



	if (prtd->audio_client) {

sound/soc/qcom/qdsp6/q6routing.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int routing_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 msm_routing_data *data = dev_get_drvdata(component->dev);

	unsigned int be_id = asoc_rtd_to_cpu(rtd, 0)->id;

	struct session_data *session;

sound/soc/qcom/sdm845.c

+7 −7
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28}; 
static int sdm845_slim_snd_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 *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai;

	struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
@@ -85,7 +85,7 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream, 
static int sdm845_tdm_snd_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 *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai;

	int ret = 0, j;
@@ -170,7 +170,7 @@ end: 
static int sdm845_snd_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 *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	int ret = 0;
@@ -301,7 +301,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream) 
{

	unsigned int fmt = SND_SOC_DAIFMT_CBS_CFS;

	unsigned int codec_dai_fmt = SND_SOC_DAIFMT_CBS_CFS;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_card *card = rtd->card;

	struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
@@ -391,7 +391,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream) 


static void  sdm845_snd_shutdown(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_card *card = rtd->card;

	struct sdm845_snd_data *data = snd_soc_card_get_drvdata(card);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
@@ -437,7 +437,7 @@ static void sdm845_snd_shutdown(struct snd_pcm_substream *substream) 


static int sdm845_snd_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 sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
@@ -476,7 +476,7 @@ static int sdm845_snd_prepare(struct snd_pcm_substream *substream) 


static int sdm845_snd_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 sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];

CRA Git | Maintained and supported by SUSTech CRA and CCSE