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

ASoC: intel: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87zg19fo4o.wl-kuninori.morimoto.gx@renesas.com


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

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

+6 −6
Original line number Diff line number Diff line
@@ -273,7 +273,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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret_val;



	dev_dbg(rtd->dev, "setting buffer ptr param\n");
@@ -593,7 +593,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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);



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

	if (substream->pcm->internal)
@@ -641,7 +641,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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);



	stream = substream->runtime->private_data;

	status = sst_get_stream_status(stream);
@@ -671,7 +671,7 @@ static snd_pcm_sframes_t sst_soc_delay(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 = asoc_rtd_to_cpu(rtd, 0);

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

	struct snd_pcm *pcm = rtd->pcm;



	if (dai->driver->playback.channels_min ||
@@ -762,7 +762,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 = asoc_rtd_to_cpu(rtd, 0);

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



		if (snd_soc_dai_active(dai)) {

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


	/* restart SSPs */

	for_each_card_rtds(drv->soc_card, rtd) {

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

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



		if (snd_soc_dai_active(dai)) {

			sst_handle_vb_timer(dai, true);

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

+3 −3
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, 
static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	int ret;



	/* Workaround: set codec PLL to 19.2MHz that PLL source is
@@ -167,7 +167,7 @@ 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_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

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

	struct snd_soc_component *component = codec_dai->component;

	int ret;

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

+5 −5
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, 
static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_MCLK, 24576000,
@@ -170,8 +170,8 @@ static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream, 
static int bdw_rt5677_dsp_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)

{

	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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_PLL1, 24576000,
@@ -227,7 +227,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 = asoc_rtd_to_codec(rtd, 0)->component;

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

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	int ret;

sound/soc/intel/boards/bdw_rt286.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static const struct snd_soc_dapm_route card_routes[] = { 


static int codec_link_init(struct snd_soc_pcm_runtime *rtd)

{

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

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

	int ret;



	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0,
@@ -75,7 +75,7 @@ static int codec_link_init(struct snd_soc_pcm_runtime *rtd) 


static void codec_link_exit(struct snd_soc_pcm_runtime *rtd)

{

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

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



	snd_soc_component_set_jack(codec, NULL, NULL);

}
@@ -98,8 +98,8 @@ static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
static int codec_link_hw_params(struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params)

{

	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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, SND_SOC_CLOCK_IN);

sound/soc/intel/boards/bxt_da7219_max98357a.c

+4 −4
Original line number Diff line number Diff line
@@ -226,8 +226,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 = asoc_rtd_to_codec(rtd, 0);

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

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

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

	int clk_freq;



	/* Configure sysclk for codec */
@@ -275,7 +275,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 = asoc_rtd_to_codec(rtd, 0);

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

	struct bxt_hdmi_pcm *pcm;



	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
@@ -293,7 +293,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 = asoc_rtd_to_cpu(rtd, 0)->component;

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



	dapm = snd_soc_component_get_dapm(component);

	snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");