linux-next: build failures after merge of the sound-asoc tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/intel/boards/skl_hda_dsp_generic.c: In function 'skl_set_hda_codec_autosuspend_delay':
sound/soc/intel/boards/skl_hda_dsp_generic.c:178:37: error: 'struct snd_soc_pcm_runtime' has no member named 'codec_dai'
  178 |  struct snd_soc_dai *codec_dai = rtd->codec_dai;
      |                                     ^~
drivers/soundwire/intel.c: In function 'sdw_stream_setup':
drivers/soundwire/intel.c:672:39: error: 'struct snd_soc_pcm_runtime' has no member named 'codec_dais'
  672 |   ret = snd_soc_dai_set_sdw_stream(rtd->codec_dais[i], sdw_stream,
      |                                       ^~
In file included from include/linux/device.h:15,
                 from include/linux/acpi.h:15,
                 from drivers/soundwire/intel.c:8:
drivers/soundwire/intel.c:676:8: error: 'struct snd_soc_pcm_runtime' has no member named 'codec_dais'
  676 |     rtd->codec_dais[i]->name);
      |        ^~
include/linux/dev_printk.h:104:32: note: in definition of macro 'dev_err'
  104 |  _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
      |                                ^~~~~~~~~~~

Caused by commit

  1729025b04b9 ("ASoC: soc-core: remove cpu_dai/codec_dai/cpu_dais/codec_dais")

interacting with commit

  3a24f135e6cc ("ASoC: intel/skl/hda - set autosuspend timeout for hda codecs")

(which should have been fixed up in commit

  df3e71c42f05 ("Merge series "ASoC: Intel: machine drivers update for 5.8" from Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>:")

or before like other references)

and interacting with commit

  5e7484d01928 ("soundwire: intel: add sdw_stream_setup helper for .startup callback")

from Linus' tree.

I have used the sound-asoc tree from next-20200414 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpE3Ww0cSQ0H.pgp
Description: OpenPGP digital signature