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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 10619 bytes --]

Hi all,

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

sound/soc/amd/yc/acp6x-mach.c:320:9: error: braces around scalar initializer [-Werror]
  320 |         {
      |         ^
sound/soc/amd/yc/acp6x-mach.c:320:9: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
sound/soc/amd/yc/acp6x-mach.c:321:17: error: field name not in record or union initializer
  321 |                 .driver_data = &acp6x_card,
      |                 ^
sound/soc/amd/yc/acp6x-mach.c:321:17: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
sound/soc/amd/yc/acp6x-mach.c:322:17: error: field name not in record or union initializer
  322 |                 .matches = {
      |                 ^
sound/soc/amd/yc/acp6x-mach.c:322:17: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
sound/soc/amd/yc/acp6x-mach.c:322:17: error: braces around scalar initializer [-Werror]
sound/soc/amd/yc/acp6x-mach.c:322:17: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
sound/soc/amd/yc/acp6x-mach.c:323:25: error: braces around scalar initializer [-Werror]
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:323:25: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
In file included from include/linux/of.h:18,
                 from include/sound/soc.h:13,
                 from sound/soc/amd/yc/acp6x-mach.c:8:
include/linux/mod_devicetable.h:588:27: error: field name not in record or union initializer
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                           ^
sound/soc/amd/yc/acp6x-mach.c:323:25: note: in expansion of macro 'DMI_MATCH'
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                         ^~~~~~~~~
include/linux/mod_devicetable.h:588:27: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                           ^
sound/soc/amd/yc/acp6x-mach.c:323:25: note: in expansion of macro 'DMI_MATCH'
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:323:35: error: initialization of 'void *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                                   ^~~~~~~~~~~~~~~~
include/linux/mod_devicetable.h:588:35: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                   ^
sound/soc/amd/yc/acp6x-mach.c:323:35: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                                   ^~~~~~~~~~~~~~~~
include/linux/mod_devicetable.h:588:35: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                   ^
include/linux/mod_devicetable.h:588:38: error: field name not in record or union initializer
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                      ^
sound/soc/amd/yc/acp6x-mach.c:323:25: note: in expansion of macro 'DMI_MATCH'
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                         ^~~~~~~~~
include/linux/mod_devicetable.h:588:38: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                      ^
sound/soc/amd/yc/acp6x-mach.c:323:25: note: in expansion of macro 'DMI_MATCH'
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:323:53: error: excess elements in scalar initializer [-Werror]
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                                                     ^~~~~~~~~~
include/linux/mod_devicetable.h:588:48: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                                ^
sound/soc/amd/yc/acp6x-mach.c:323:53: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  323 |                         DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
      |                                                     ^~~~~~~~~~
include/linux/mod_devicetable.h:588:48: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                                ^
sound/soc/amd/yc/acp6x-mach.c:324:25: error: braces around scalar initializer [-Werror]
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:324:25: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
include/linux/mod_devicetable.h:588:27: error: field name not in record or union initializer
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                           ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
include/linux/mod_devicetable.h:588:27: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                           ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:324:35: error: initialization of 'void *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                                   ^~~~~~~~~~~~~~~~~~~
include/linux/mod_devicetable.h:588:35: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                   ^
sound/soc/amd/yc/acp6x-mach.c:324:35: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                                   ^~~~~~~~~~~~~~~~~~~
include/linux/mod_devicetable.h:588:35: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                   ^
include/linux/mod_devicetable.h:588:38: error: field name not in record or union initializer
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                      ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
include/linux/mod_devicetable.h:588:38: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                      ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:324:56: error: excess elements in scalar initializer [-Werror]
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                                                        ^~~~~~~~
include/linux/mod_devicetable.h:588:48: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                                ^
sound/soc/amd/yc/acp6x-mach.c:324:56: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                                                        ^~~~~~~~
include/linux/mod_devicetable.h:588:48: note: in definition of macro 'DMI_MATCH'
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                                                ^
include/linux/mod_devicetable.h:588:25: error: excess elements in scalar initializer [-Werror]
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                         ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
include/linux/mod_devicetable.h:588:25: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
  588 | #define DMI_MATCH(a, b) { .slot = a, .substr = b }
      |                         ^
sound/soc/amd/yc/acp6x-mach.c:324:25: note: in expansion of macro 'DMI_MATCH'
  324 |                         DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
      |                         ^~~~~~~~~
sound/soc/amd/yc/acp6x-mach.c:322:28: error: excess elements in scalar initializer [-Werror]
  322 |                 .matches = {
      |                            ^
sound/soc/amd/yc/acp6x-mach.c:322:28: note: (near initialization for 'yc_acp_quirk_table[38].driver_data')
sound/soc/amd/yc/acp6x-mach.c:327:9: error: extra brace group at end of initializer
  327 |         {}
      |         ^
sound/soc/amd/yc/acp6x-mach.c:327:9: note: (near initialization for 'yc_acp_quirk_table[38]')
sound/soc/amd/yc/acp6x-mach.c:327:9: error: excess elements in struct initializer [-Werror]
sound/soc/amd/yc/acp6x-mach.c:327:9: note: (near initialization for 'yc_acp_quirk_table[38]')
sound/soc/amd/yc/acp6x-mach.c:328:2: error: expected '}' before ';' token
  328 | };
      |  ^
sound/soc/amd/yc/acp6x-mach.c:47:58: note: to match this '{'
   47 | static const struct dmi_system_id yc_acp_quirk_table[] = {
      |                                                          ^

Caused by commit

  af233bd2931b ("ASoC: Merge up fixes for CI")

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]