ALSA: usb-audio: Rewrite registration quirk handling

[ Upstream commit d8695bc5b1fe88305396b1f788d3b5f218e28a30 ]

A slight refactoring of the registration quirk code.  Now it uses the
table lookup for easy additions in future.  Also the return type was
changed to bool, and got a few more comments.

Link: https://lore.kernel.org/r/20200325103322.2508-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 2284377cbb98da4642d78797b3e4538ee72d22d7..230d862cfa3a8f94c0aa2ba5d43fb4872667a143 100644 (file)
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -662,7 +662,7 @@ static int usb_audio_probe(struct usb_interface *intf,
        /* we are allowed to call snd_card_register() many times, but first
         * check to see if a device needs to skip it or do anything special
         */
-       if (snd_usb_registration_quirk(chip, ifnum) == 0) {
+       if (!snd_usb_registration_quirk(chip, ifnum)) {
                err = snd_card_register(chip->card);
                if (err < 0)
                        goto __error;

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index f3e26e65c3257f2310dbd889fac834e94266eddf..ad557ab65e043c84036090cf2aab7899bea13b39 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1783,16 +1783,36 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
        }
 }
 
-int snd_usb_registration_quirk(struct snd_usb_audio *chip,
-                              int iface)
+/*
+ * registration quirk:
+ * the registration is skipped if a device matches with the given ID,
+ * unless the interface reaches to the defined one.  This is for delaying
+ * the registration until the last known interface, so that the card and
+ * devices appear at the same time.
+ */
+
+struct registration_quirk {
+       unsigned int usb_id;    /* composed via USB_ID() */
+       unsigned int interface; /* the interface to trigger register */
+};
+
+#define REG_QUIRK_ENTRY(vendor, product, iface) \
+       { .usb_id = USB_ID(vendor, product), .interface = (iface) }
+
+static const struct registration_quirk registration_quirks[] = {
+       REG_QUIRK_ENTRY(0x0951, 0x16d8, 2),     /* Kingston HyperX AMP */
+       { 0 }                                   /* terminator */
+};
+
+/* return true if skipping registration */
+bool snd_usb_registration_quirk(struct snd_usb_audio *chip, int iface)
 {
-       switch (chip->usb_id) {
-       case USB_ID(0x0951, 0x16d8): /* Kingston HyperX AMP */
-               /* Register only when we reach interface 2 so that streams can
-                * merge correctly into PCMs from interface 0
-                */
-               return (iface != 2);
-       }
+       const struct registration_quirk *q;
+
+       for (q = registration_quirks; q->usb_id; q++)
+               if (chip->usb_id == q->usb_id)
+                       return iface != q->interface;
+
        /* Register as normal */
-       return 0;
+       return false;
 }

diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h
index 3afc01eabc7e2a5aecd603488bde35002df050c9..c76cf24a640a6ff811eda6106d35f8991da02789 100644 (file)
--- a/sound/usb/quirks.h
+++ b/sound/usb/quirks.h
@@ -51,7 +51,6 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
                                          struct audioformat *fp,
                                          int stream);
 
-int snd_usb_registration_quirk(struct snd_usb_audio *chip,
-                              int iface);
+bool snd_usb_registration_quirk(struct snd_usb_audio *chip, int iface);
 
 #endif /* __USBAUDIO_QUIRKS_H */