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

[Stephen Rothwell]

Hi all,

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

sound/soc/amd/acp-pcm-dma.c: In function 'acp_dma_open':
sound/soc/amd/acp-pcm-dma.c:714:35: error: 'struct dw_i2s_dev' has no member named 'i2s_instance'; did you mean 'i2s_base'?
   adata->i2s_play_instance = dev->i2s_instance;
                                   ^~~~~~~~~~~~
                                   i2s_base
sound/soc/amd/acp-pcm-dma.c:715:35: error: 'I2S_SP_INSTANCE' undeclared (first use in this function); did you mean 'SS_ONSTACK'?
   if (adata->i2s_play_instance == I2S_SP_INSTANCE)
                                   ^~~~~~~~~~~~~~~
                                   SS_ONSTACK
sound/soc/amd/acp-pcm-dma.c:715:35: note: each undeclared identifier is reported only once for each function it appears in
sound/soc/amd/acp-pcm-dma.c:717:40: error: 'I2S_BT_INSTANCE' undeclared (first use in this function); did you mean 'I2S_SP_INSTANCE'?
   else if (adata->i2s_play_instance == I2S_BT_INSTANCE)
                                        ^~~~~~~~~~~~~~~
                                        I2S_SP_INSTANCE
sound/soc/amd/acp-pcm-dma.c:722:38: error: 'struct dw_i2s_dev' has no member named 'i2s_instance'; did you mean 'i2s_base'?
   adata->i2s_capture_instance = dev->i2s_instance;
                                      ^~~~~~~~~~~~
                                      i2s_base
sound/soc/amd/acp-pcm-dma.c: In function 'acp_dma_close':
sound/soc/amd/acp-pcm-dma.c:1046:8: error: 'I2S_BT_INSTANCE' undeclared (first use in this function)
   case I2S_BT_INSTANCE:
        ^~~~~~~~~~~~~~~
sound/soc/amd/acp-pcm-dma.c:1049:8: error: 'I2S_SP_INSTANCE' undeclared (first use in this function); did you mean 'I2S_BT_INSTANCE'?
   case I2S_SP_INSTANCE:
        ^~~~~~~~~~~~~~~
        I2S_BT_INSTANCE

Caused by commit

  363fe37948e2 ("ASoC: amd: dma driver changes for BT I2S controller instance")

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

-- 
Cheers,
Stephen Rothwell

Attachment: pgpRZj1afAiNe.pgp
Description: OpenPGP digital signature