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

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


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

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

+3 −3
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ static snd_pcm_uframes_t sst_soc_pointer(struct snd_soc_component *component, 
static int sst_soc_pcm_new(struct snd_soc_component *component,

			   struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *dai = rtd->cpu_dai;

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

	struct snd_pcm *pcm = rtd->pcm;



	if (dai->driver->playback.channels_min ||
@@ -741,7 +741,7 @@ static int sst_soc_prepare(struct device *dev) 


	/* set the SSPs to idle */

	for_each_card_rtds(drv->soc_card, rtd) {

		struct snd_soc_dai *dai = rtd->cpu_dai;

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



		if (dai->active) {

			send_ssp_cmd(dai, dai->name, 0);
@@ -762,7 +762,7 @@ static void sst_soc_complete(struct device *dev) 


	/* restart SSPs */

	for_each_card_rtds(drv->soc_card, rtd) {

		struct snd_soc_dai *dai = rtd->cpu_dai;

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



		if (dai->active) {

			sst_handle_vb_timer(dai, true);

sound/soc/intel/boards/bdw-rt5650.c

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int bdw_rt5650_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 *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	/* Workaround: set codec PLL to 19.2MHz that PLL source is
@@ -166,8 +166,8 @@ static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct bdw_rt5650_priv *bdw_rt5650 =

		snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_component *component = rtd->codec_dai->component;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct snd_soc_component *component = codec_dai->component;

	int ret;



	/* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1.

sound/soc/intel/boards/bdw-rt5677.c

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int bdw_rt5677_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 *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_MCLK, 24576000,
@@ -174,7 +174,7 @@ static int bdw_rt5677_dsp_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 *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_PLL1, 24576000,
@@ -226,7 +226,7 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct bdw_rt5677_priv *bdw_rt5677 =

			snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_component *component = rtd->codec_dai->component;

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	int ret;

sound/soc/intel/boards/broadwell.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static const struct snd_soc_dapm_route broadwell_rt286_map[] = { 


static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = rtd->codec_dai->component;

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	int ret = 0;

	ret = snd_soc_card_jack_new(rtd->card, "Headset",

		SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset,
@@ -104,7 +104,7 @@ static int broadwell_rt286_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 *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000,

sound/soc/intel/boards/bxt_da7219_max98357a.c

+4 −4
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd, 
static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	int ret;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_component *component = rtd->codec_dai->component;

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

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	int clk_freq;



	/* Configure sysclk for codec */
@@ -226,7 +226,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

	struct bxt_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_dai *dai = rtd->codec_dai;

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

	struct bxt_hdmi_pcm *pcm;



	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
@@ -244,7 +244,7 @@ static int broxton_hdmi_init(struct snd_soc_pcm_runtime *rtd) 
static int broxton_da7219_fe_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dapm_context *dapm;

	struct snd_soc_component *component = rtd->cpu_dai->component;

	struct snd_soc_component *component = asoc_rtd_to_cpu(rtd, 0)->component;



	dapm = snd_soc_component_get_dapm(component);

	snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");

CRA Git | Maintained and supported by SUSTech CRA and CCSE