+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+ 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;
-+ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
++ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ int sampling_freq = 1;
+ int ret;
+ struct wm8804_clk_cfg clk_cfg;
+{
+ struct snd_rpi_simple_drvdata *drvdata =
+ snd_soc_card_get_drvdata(rtd->card);
-+ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
++ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+
+ if (drvdata->fixed_bclk_ratio > 0)
+ return snd_soc_dai_set_bclk_ratio(cpu_dai,
+ int ret;
+
+ snd_rpi_simple_init(rtd);
-+ codec_dai = asoc_rtd_to_codec(rtd, 0);
++ codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+
+ dac = codec_dai[0].component;
+
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
++ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ struct snd_rpi_simple_drvdata *drvdata;
+ unsigned int sample_bits;
+
+static int adau1977_init(struct snd_soc_pcm_runtime *rtd)
+{
+ int ret;
-+ 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);
+
+ ret = snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 0, 0);
+ if (ret < 0)