USB audio gadget: Prefix all macro definitions with UAC_ in linux/usb/audio.h

linux/usb/audio.h is a public header file that includes definitions
exported to userspace. To avoid namespace clashes, prefix all macro
definitions with UAC_. Existing macros and structures prefixed with
USB_AC_ and USB_AS_ are renamed for consistency.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c
index 9f80f4e970bd..a3a0f4a27ef0 100644
--- a/drivers/usb/gadget/audio.c
+++ b/drivers/usb/gadget/audio.c
@@ -106,20 +106,20 @@ static int audio_set_endpoint_req(struct usb_configuration *c,
                         ctrl->bRequest, w_value, len, ep);
 
         switch (ctrl->bRequest) {
-        case SET_CUR:
+        case UAC_SET_CUR:
                 value = 0;
                 break;
 
-        case SET_MIN:
+        case UAC_SET_MIN:
                 break;
 
-        case SET_MAX:
+        case UAC_SET_MAX:
                 break;
 
-        case SET_RES:
+        case UAC_SET_RES:
                 break;
 
-        case SET_MEM:
+        case UAC_SET_MEM:
                 break;
 
         default:
@@ -142,13 +142,13 @@ static int audio_get_endpoint_req(struct usb_configuration *c,
                         ctrl->bRequest, w_value, len, ep);
 
         switch (ctrl->bRequest) {
-        case GET_CUR:
-        case GET_MIN:
-        case GET_MAX:
-        case GET_RES:
+        case UAC_GET_CUR:
+        case UAC_GET_MIN:
+        case UAC_GET_MAX:
+        case UAC_GET_RES:
                 value = 3;
                 break;
-        case GET_MEM:
+        case UAC_GET_MEM:
                 break;
         default:
                 break;
@@ -171,11 +171,11 @@ audio_setup(struct usb_configuration *c, const struct usb_ctrlrequest *ctrl)
          * Audio class messages; interface activation uses set_alt().
          */
         switch (ctrl->bRequestType) {
-        case USB_AUDIO_SET_ENDPOINT:
+        case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                 value = audio_set_endpoint_req(c, ctrl);
                 break;
 
-        case USB_AUDIO_GET_ENDPOINT:
+        case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_ENDPOINT:
                 value = audio_get_endpoint_req(c, ctrl);
                 break;