[RFC 09/15] ALSA: usb: Switch to the two-stage quirk applying

[Cezary Rojewski <cezary.rojewski@intel.com>]

Utilize newly added functions and update existing apply-quirks procedure
for USB Audio-Class (AC) device from one-stage into two-stage process.
In consequence, drop create_uaxx_quirk() and create_autodetect_quirk()
and update existing snd_usb_create_quirk() so that it only creates new
streams, leaving the PCM parsing process to snd_usb_parse_pcms_quirk().

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/usb/quirks.c | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 4e402c6406a9..037a45c79fbe 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -412,7 +412,6 @@ static int create_autodetect_pcm_quirk(struct snd_usb_audio *chip,
 	return create_auto_pcm_quirk(chip, iface, driver);
 }
 
-__maybe_unused
 static int create_autodetect_midi_quirk(struct snd_usb_audio *chip,
 					struct usb_interface *iface,
 					struct usb_driver *driver,
@@ -423,19 +422,6 @@ static int create_autodetect_midi_quirk(struct snd_usb_audio *chip,
 	return 1;
 }
 
-static int create_autodetect_quirk(struct snd_usb_audio *chip,
-				   struct usb_interface *iface,
-				   struct usb_driver *driver,
-				   const struct snd_usb_audio_quirk *quirk)
-{
-	int err;
-
-	err = create_auto_pcm_quirk(chip, iface, driver);
-	if (err == -ENODEV)
-		err = create_auto_midi_quirk(chip, iface, driver);
-	return err;
-}
-
 static int create_uaxx_pcm_quirk(struct snd_usb_audio *chip,
 				 struct usb_interface *iface,
 				 struct usb_driver *driver,
@@ -556,30 +542,6 @@ static int create_uaxx_midi_quirk(struct snd_usb_audio *chip,
 				    &chip->num_rawmidis);
 }
 
-static int create_uaxx_quirk(struct snd_usb_audio *chip,
-			     struct usb_interface *iface,
-			     struct usb_driver *driver,
-			     const struct snd_usb_audio_quirk *quirk)
-{
-	struct usb_interface_descriptor *altsd;
-	struct usb_host_interface *alts;
-
-	/* both PCM and MIDI interfaces have 2 or more altsettings */
-	if (iface->num_altsetting < 2)
-		return -ENXIO;
-	alts = &iface->altsetting[1];
-	altsd = get_iface_desc(alts);
-
-	switch (altsd->bNumEndpoints) {
-	case 2:
-		return create_uaxx_midi_quirk(chip, iface, driver, quirk);
-	case 1:
-		return create_uaxx_pcm_quirk(chip, iface, driver, quirk);
-	default:
-		return -ENXIO;
-	}
-}
-
 /*
  * Create a standard mixer for the specified interface.
  */
@@ -652,7 +614,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
 	static const quirk_func_t quirk_funcs[] = {
 		[QUIRK_IGNORE_INTERFACE] = ignore_interface_quirk,
 		[QUIRK_COMPOSITE] = create_composite_quirk,
-		[QUIRK_AUTODETECT] = create_autodetect_quirk,
+		[QUIRK_AUTODETECT] = create_autodetect_midi_quirk,
 		[QUIRK_MIDI_STANDARD_INTERFACE] = create_any_midi_quirk,
 		[QUIRK_MIDI_FIXED_ENDPOINT] = create_any_midi_quirk,
 		[QUIRK_MIDI_YAMAHA] = create_any_midi_quirk,
@@ -667,7 +629,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
 		[QUIRK_MIDI_CH345] = create_any_midi_quirk,
 		[QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
 		[QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
-		[QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,
+		[QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_midi_quirk,
 		[QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk,
 	};
 
-- 
2.25.1