ALSA: usb-audio: unify UAC macros and struct names

Get rid of the last occurances of _v1 suffixes, and move the version
number right after the "uac" string. Now things are consitent again.

Sorry for the forth and back, but it just looks much nicer this way.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 6f6596cf2b19..2af0f9e3dcdf 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -275,7 +275,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                 /* get audio formats */
                 switch (protocol) {
                 case UAC_VERSION_1: {
-                        struct uac_as_header_descriptor_v1 *as =
+                        struct uac1_as_header_descriptor *as =
                                 snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
 
                         if (!as) {
@@ -297,7 +297,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
                 case UAC_VERSION_2: {
                         struct uac2_input_terminal_descriptor *input_term;
                         struct uac2_output_terminal_descriptor *output_term;
-                        struct uac_as_header_descriptor_v2 *as =
+                        struct uac2_as_header_descriptor *as =
                                 snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
 
                         if (!as) {