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>

3 files changed, 56 insertions, 56 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;
 
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 76afbd1b515f..7b05b3c8c0b1 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -50,16 +50,16 @@ static struct usb_interface_descriptor ac_interface_desc __initdata = {
         .bInterfaceSubClass =   USB_SUBCLASS_AUDIOCONTROL,
 };
 
-DECLARE_USB_AC_HEADER_DESCRIPTOR(2);
+DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
 
-#define USB_DT_AC_HEADER_LENGH  USB_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
+#define UAC_DT_AC_HEADER_LENGTH UAC_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static struct usb_ac_header_descriptor_2 ac_header_desc = {
-        .bLength =              USB_DT_AC_HEADER_LENGH,
+static struct uac_ac_header_descriptor_2 ac_header_desc = {
+        .bLength =              UAC_DT_AC_HEADER_LENGTH,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype =   HEADER,
+        .bDescriptorSubtype =   UAC_HEADER,
         .bcdADC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         __constant_cpu_to_le16(USB_DT_AC_HEADER_LENGH),
+        .wTotalLength =         __constant_cpu_to_le16(UAC_DT_AC_HEADER_LENGTH),
         .bInCollection =        F_AUDIO_NUM_INTERFACES,
         .baInterfaceNr = {
                 [0] =           F_AUDIO_AC_INTERFACE,
@@ -68,33 +68,33 @@ static struct usb_ac_header_descriptor_2 ac_header_desc = {
 };
 
 #define INPUT_TERMINAL_ID       1
-static struct usb_input_terminal_descriptor input_terminal_desc = {
-        .bLength =              USB_DT_AC_INPUT_TERMINAL_SIZE,
+static struct uac_input_terminal_descriptor input_terminal_desc = {
+        .bLength =              UAC_DT_INPUT_TERMINAL_SIZE,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype =   INPUT_TERMINAL,
+        .bDescriptorSubtype =   UAC_INPUT_TERMINAL,
         .bTerminalID =          INPUT_TERMINAL_ID,
-        .wTerminalType =        USB_AC_TERMINAL_STREAMING,
+        .wTerminalType =        UAC_TERMINAL_STREAMING,
         .bAssocTerminal =       0,
         .wChannelConfig =       0x3,
 };
 
-DECLARE_USB_AC_FEATURE_UNIT_DESCRIPTOR(0);
+DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(0);
 
 #define FEATURE_UNIT_ID         2
-static struct usb_ac_feature_unit_descriptor_0 feature_unit_desc = {
-        .bLength                = USB_DT_AC_FEATURE_UNIT_SIZE(0),
+static struct uac_feature_unit_descriptor_0 feature_unit_desc = {
+        .bLength                = UAC_DT_FEATURE_UNIT_SIZE(0),
         .bDescriptorType        = USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype     = FEATURE_UNIT,
+        .bDescriptorSubtype     = UAC_FEATURE_UNIT,
         .bUnitID                = FEATURE_UNIT_ID,
         .bSourceID              = INPUT_TERMINAL_ID,
         .bControlSize           = 2,
-        .bmaControls[0]         = (FU_MUTE | FU_VOLUME),
+        .bmaControls[0]         = (UAC_FU_MUTE | UAC_FU_VOLUME),
 };
 
 static struct usb_audio_control mute_control = {
         .list = LIST_HEAD_INIT(mute_control.list),
         .name = "Mute Control",
-        .type = MUTE_CONTROL,
+        .type = UAC_MUTE_CONTROL,
         /* Todo: add real Mute control code */
         .set = generic_set_cmd,
         .get = generic_get_cmd,
@@ -103,7 +103,7 @@ static struct usb_audio_control mute_control = {
 static struct usb_audio_control volume_control = {
         .list = LIST_HEAD_INIT(volume_control.list),
         .name = "Volume Control",
-        .type = VOLUME_CONTROL,
+        .type = UAC_VOLUME_CONTROL,
         /* Todo: add real Volume control code */
         .set = generic_set_cmd,
         .get = generic_get_cmd,
@@ -113,17 +113,17 @@ static struct usb_audio_control_selector feature_unit = {
         .list = LIST_HEAD_INIT(feature_unit.list),
         .id = FEATURE_UNIT_ID,
         .name = "Mute & Volume Control",
-        .type = FEATURE_UNIT,
+        .type = UAC_FEATURE_UNIT,
         .desc = (struct usb_descriptor_header *)&feature_unit_desc,
 };
 
 #define OUTPUT_TERMINAL_ID      3
-static struct usb_output_terminal_descriptor output_terminal_desc = {
-        .bLength                = USB_DT_AC_OUTPUT_TERMINAL_SIZE,
+static struct uac_output_terminal_descriptor output_terminal_desc = {
+        .bLength                = UAC_DT_OUTPUT_TERMINAL_SIZE,
         .bDescriptorType        = USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype     = OUTPUT_TERMINAL,
+        .bDescriptorSubtype     = UAC_OUTPUT_TERMINAL,
         .bTerminalID            = OUTPUT_TERMINAL_ID,
-        .wTerminalType          = USB_AC_OUTPUT_TERMINAL_SPEAKER,
+        .wTerminalType          = UAC_OUTPUT_TERMINAL_SPEAKER,
         .bAssocTerminal         = FEATURE_UNIT_ID,
         .bSourceID              = FEATURE_UNIT_ID,
 };
@@ -148,22 +148,22 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = {
 };
 
 /* B.4.2  Class-Specific AS Interface Descriptor */
-static struct usb_as_header_descriptor as_header_desc = {
-        .bLength =              USB_DT_AS_HEADER_SIZE,
+static struct uac_as_header_descriptor as_header_desc = {
+        .bLength =              UAC_DT_AS_HEADER_SIZE,
         .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype =   AS_GENERAL,
+        .bDescriptorSubtype =   UAC_AS_GENERAL,
         .bTerminalLink =        INPUT_TERMINAL_ID,
         .bDelay =               1,
-        .wFormatTag =           USB_AS_AUDIO_FORMAT_TYPE_I_PCM,
+        .wFormatTag =           UAC_FORMAT_TYPE_I_PCM,
 };
 
-DECLARE_USB_AS_FORMAT_TYPE_I_DISCRETE_DESC(1);
+DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(1);
 
-static struct usb_as_formate_type_i_discrete_descriptor_1 as_type_i_desc = {
-        .bLength =              USB_AS_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
+static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = {
+        .bLength =              UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1),
         .bDescriptorType =      USB_DT_CS_INTERFACE,
-        .bDescriptorSubtype =   FORMAT_TYPE,
-        .bFormatType =          USB_AS_FORMAT_TYPE_I,
+        .bDescriptorSubtype =   UAC_FORMAT_TYPE,
+        .bFormatType =          UAC_FORMAT_TYPE_I,
         .bSubframeSize =        2,
         .bBitResolution =       16,
         .bSamFreqType =         1,
@@ -181,10 +181,10 @@ static struct usb_endpoint_descriptor as_out_ep_desc __initdata = {
 };
 
 /* Class-specific AS ISO OUT Endpoint Descriptor */
-static struct usb_as_iso_endpoint_descriptor as_iso_out_desc __initdata = {
-        .bLength =              USB_AS_ISO_ENDPOINT_DESC_SIZE,
+static struct uac_iso_endpoint_descriptor as_iso_out_desc __initdata = {
+        .bLength =              UAC_ISO_ENDPOINT_DESC_SIZE,
         .bDescriptorType =      USB_DT_CS_ENDPOINT,
-        .bDescriptorSubtype =   EP_GENERAL,
+        .bDescriptorSubtype =   UAC_EP_GENERAL,
         .bmAttributes =         1,
         .bLockDelayUnits =      1,
         .wLockDelay =           __constant_cpu_to_le16(1),
@@ -456,11 +456,11 @@ f_audio_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
          * Audio class messages; interface activation uses set_alt().
          */
         switch (ctrl->bRequestType) {
-        case USB_AUDIO_SET_INTF:
+        case USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
                 value = audio_set_intf_req(f, ctrl);
                 break;
 
-        case USB_AUDIO_GET_INTF:
+        case USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE:
                 value = audio_get_intf_req(f, ctrl);
                 break;
 
@@ -642,10 +642,10 @@ int __init control_selector_init(struct f_audio *audio)
         list_add(&mute_control.list, &feature_unit.control);
         list_add(&volume_control.list, &feature_unit.control);
 
-        volume_control.data[_CUR] = 0xffc0;
-        volume_control.data[_MIN] = 0xe3a0;
-        volume_control.data[_MAX] = 0xfff0;
-        volume_control.data[_RES] = 0x0030;
+        volume_control.data[UAC__CUR] = 0xffc0;
+        volume_control.data[UAC__MIN] = 0xe3a0;
+        volume_control.data[UAC__MAX] = 0xfff0;
+        volume_control.data[UAC__RES] = 0x0030;
 
         return 0;
 }
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index b9312dc6e041..d0b1e836f0e0 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -191,7 +191,7 @@ module_param(qlen, uint, S_IRUGO);
 #define GMIDI_MS_INTERFACE      1
 #define GMIDI_NUM_INTERFACES    2
 
-DECLARE_USB_AC_HEADER_DESCRIPTOR(1);
+DECLARE_UAC_AC_HEADER_DESCRIPTOR(1);
 DECLARE_USB_MIDI_OUT_JACK_DESCRIPTOR(1);
 DECLARE_USB_MS_ENDPOINT_DESCRIPTOR(1);
 
@@ -237,12 +237,12 @@ static const struct usb_interface_descriptor ac_interface_desc = {
 };
 
 /* B.3.2  Class-Specific AC Interface Descriptor */
-static const struct usb_ac_header_descriptor_1 ac_header_desc = {
-        .bLength =              USB_DT_AC_HEADER_SIZE(1),
+static const struct uac_ac_header_descriptor_1 ac_header_desc = {
+        .bLength =              UAC_DT_AC_HEADER_SIZE(1),
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
         .bcdADC =               cpu_to_le16(0x0100),
-        .wTotalLength =         cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
+        .wTotalLength =         cpu_to_le16(UAC_DT_AC_HEADER_SIZE(1)),
         .bInCollection =        1,
         .baInterfaceNr = {
                 [0] =           GMIDI_MS_INTERFACE,