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

ASoC: qcom: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer 



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/87imivir5q.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/qcom/apq8016_sbc.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct apq8016_sbc_data { 


static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

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

	struct snd_soc_dai *codec_dai;

	struct snd_soc_component *component;

	struct snd_soc_card *card = rtd->card;

sound/soc/qcom/apq8096.c

+3 −3
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 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_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

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

	u32 rx_ch_cnt = 0, tx_ch_cnt = 0;

	int ret = 0;
@@ -66,7 +66,7 @@ static struct snd_soc_ops apq8096_ops = { 


static int apq8096_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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



	/*

	 * Codec SLIMBUS configuration

sound/soc/qcom/lpass-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;

	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;

	int ret, dma_ch, dir = substream->stream;

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

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int q6asm_dai_open(struct snd_soc_component *component, 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = soc_prtd->cpu_dai;

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

	struct q6asm_dai_rtd *prtd;

	struct q6asm_dai_data *pdata;

	struct device *dev = component->dev;
@@ -545,7 +545,7 @@ static int q6asm_dai_compr_open(struct snd_compr_stream *stream) 
	struct snd_soc_pcm_runtime *rtd = stream->private_data;

	struct snd_soc_component *c = snd_soc_rtdcom_lookup(rtd, DRV_NAME);

	struct snd_compr_runtime *runtime = stream->runtime;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

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

	struct q6asm_dai_data *pdata;

	struct device *dev = c->dev;

	struct q6asm_dai_rtd *prtd;

sound/soc/qcom/qdsp6/q6routing.c

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static int routing_hw_params(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct msm_routing_data *data = dev_get_drvdata(component->dev);

	unsigned int be_id = rtd->cpu_dai->id;

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

	struct session_data *session;

	int path_type;

CRA Git | Maintained and supported by SUSTech CRA and CCSE