[alsa-devel] [PATCH] usb/gadget/{f_audio, gmidi}.c: follow recent changes in audio.h

[Takashi Iwai]

At Tue, 23 Feb 2010 10:30:00 +0100,
Daniel Mack wrote:
> 
> Some structs in linux/usb/audio.h have got new names to mark them as
> part of version 1.0 of the USB audio standard. Follow these changes
> in the gadget drivers.
> 
> Not that this header and the ALSA USB driver will undergo some
> refactoring soon, so there might be another update to the gadgets as
> well.
> 
> Signed-off-by: Daniel Mack <daniel at caiaq.de>
> ---
> I believe this would be best to go thru the ALSA tree as the other
> changes are there, too.

Yep, now applied to topic/usb-v2.0 branch of sound git tree.

If anyone has no objection, I'll merge this branch today for
linux-next.


thanks,

Takashi

> drivers/usb/gadget/f_audio.c |    6 +++---
>  drivers/usb/gadget/gmidi.c   |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
> index df77f61..f1e3aad 100644
> --- a/drivers/usb/gadget/f_audio.c
> +++ b/drivers/usb/gadget/f_audio.c
> @@ -60,7 +60,7 @@ DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
>  #define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
>  	+ UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
>  /* B.3.2  Class-Specific AC Interface Descriptor */
> -static struct uac_ac_header_descriptor_2 ac_header_desc = {
> +static struct uac_ac_header_descriptor_v1_2 ac_header_desc = {
>  	.bLength =		UAC_DT_AC_HEADER_LENGTH,
>  	.bDescriptorType =	USB_DT_CS_INTERFACE,
>  	.bDescriptorSubtype =	UAC_HEADER,
> @@ -124,7 +124,7 @@ static struct usb_audio_control_selector feature_unit = {
>  };
>  
>  #define OUTPUT_TERMINAL_ID	3
> -static struct uac_output_terminal_descriptor output_terminal_desc = {
> +static struct uac_output_terminal_descriptor_v1 output_terminal_desc = {
>  	.bLength		= UAC_DT_OUTPUT_TERMINAL_SIZE,
>  	.bDescriptorType	= USB_DT_CS_INTERFACE,
>  	.bDescriptorSubtype	= UAC_OUTPUT_TERMINAL,
> @@ -154,7 +154,7 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = {
>  };
>  
>  /* B.4.2  Class-Specific AS Interface Descriptor */
> -static struct uac_as_header_descriptor as_header_desc = {
> +static struct uac_as_header_descriptor_v1 as_header_desc = {
>  	.bLength =		UAC_DT_AS_HEADER_SIZE,
>  	.bDescriptorType =	USB_DT_CS_INTERFACE,
>  	.bDescriptorSubtype =	UAC_AS_GENERAL,
> diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
> index d0b1e83..5f6a2e0 100644
> --- a/drivers/usb/gadget/gmidi.c
> +++ b/drivers/usb/gadget/gmidi.c
> @@ -237,7 +237,7 @@ static const struct usb_interface_descriptor ac_interface_desc = {
>  };
>  
>  /* B.3.2  Class-Specific AC Interface Descriptor */
> -static const struct uac_ac_header_descriptor_1 ac_header_desc = {
> +static const struct uac_ac_header_descriptor_v1_1 ac_header_desc = {
>  	.bLength =		UAC_DT_AC_HEADER_SIZE(1),
>  	.bDescriptorType =	USB_DT_CS_INTERFACE,
>  	.bDescriptorSubtype =	USB_MS_HEADER,
> -- 
> 1.6.6.2
>