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, 1 insertions, 1 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 7a8ac1d81be7..9feb00c831a0 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -217,7 +217,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
 
         switch (protocol) {
         case UAC_VERSION_1: {
-                struct uac_ac_header_descriptor_v1 *h1 = control_header;
+                struct uac1_ac_header_descriptor *h1 = control_header;
 
                 if (!h1->bInCollection) {
                         snd_printk(KERN_INFO "skipping empty audio interface (v1)\n");