OSDN Git Service

ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro
authorTakashi Iwai <tiwai@suse.de>
Wed, 25 Jul 2018 21:00:46 +0000 (23:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 26 Jul 2018 06:30:57 +0000 (08:30 +0200)
AU0828_DEVICE() macro in quirks-table.h uses USB_DEVICE_VENDOR_SPEC()
for expanding idVendor and idProduct fields.  However, the latter
macro adds also match_flags and bInterfaceClass, which are different
from the values AU0828_DEVICE() macro sets after that.

For fixing them, just expand idVendor and idProduct fields manually in
AU0828_DEVICE().

This fixes sparse warnings like:
  sound/usb/quirks-table.h:2892:1: warning: Initializer entry defined twice

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/quirks-table.h

index 8aac48f..08aa780 100644 (file)
@@ -2875,7 +2875,8 @@ YAMAHA_DEVICE(0x7010, "UB99"),
  */
 
 #define AU0828_DEVICE(vid, pid, vname, pname) { \
-       USB_DEVICE_VENDOR_SPEC(vid, pid), \
+       .idVendor = vid, \
+       .idProduct = pid, \
        .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
                       USB_DEVICE_ID_MATCH_INT_CLASS | \
                       USB_DEVICE_ID_MATCH_INT_SUBCLASS, \