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

From: Stephen Rothwell
Date: Tue Jan 31 2023 - 19:14:27 EST


Hi all,

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

sound/soc/codecs/cs42l42-sdw.c: In function 'cs42l42_sdw_dai_set_sdw_stream':
sound/soc/codecs/cs42l42-sdw.c:159:20: error: 'struct snd_soc_dai' has no member named 'playback_dma_data'
159 | dai->playback_dma_data = sdw_stream;
| ^~
sound/soc/codecs/cs42l42-sdw.c:161:20: error: 'struct snd_soc_dai' has no member named 'capture_dma_data'
161 | dai->capture_dma_data = sdw_stream;
| ^~

Caused by commit

90f6a2a20bd2 ("ASoC: cs42l42: Add SoundWire support")

interacting with commit

3653480c6812 ("ASoC: soc-dai.h: cleanup Playback/Capture data for snd_soc_dai")

which should have been fixed up in commit

98fda42a85b4 ("ASoC: cs42l42: Add SoundWire support")

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

--
Cheers,
Stephen Rothwell

Attachment: pgpbtfKRvHYgs.pgp
Description: OpenPGP digital signature