Procházet zdrojové kódy

usb gadget: Rename husb2dev -> usba

husb2dev was the internal name of the USB Device Controller on
AT32AP7000. Rename it to "atmel_usba", which is closer to the official
name used in documentation and marketing material.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haavard Skinnemoen před 18 roky
rodič
revize
55b3fd41b0
2 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. 1 1
      drivers/usb/gadget/ether.c
  2. 4 4
      drivers/usb/gadget/gadget_chips.h

+ 1 - 1
drivers/usb/gadget/ether.c

@@ -277,7 +277,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
 #define DEV_CONFIG_CDC
 #define DEV_CONFIG_CDC
 #endif
 #endif
 
 
-#ifdef CONFIG_USB_GADGET_HUSB2DEV
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
 #define DEV_CONFIG_CDC
 #define DEV_CONFIG_CDC
 #endif
 #endif
 
 

+ 4 - 4
drivers/usb/gadget/gadget_chips.h

@@ -82,10 +82,10 @@
 #define	gadget_is_pxa27x(g)	0
 #define	gadget_is_pxa27x(g)	0
 #endif
 #endif
 
 
-#ifdef CONFIG_USB_GADGET_HUSB2DEV
-#define gadget_is_husb2dev(g)	!strcmp("husb2_udc", (g)->name)
+#ifdef CONFIG_USB_GADGET_ATMEL_USBA
+#define gadget_is_atmel_usba(g)	!strcmp("atmel_usba_udc", (g)->name)
 #else
 #else
-#define gadget_is_husb2dev(g)	0
+#define gadget_is_atmel_usba(g)	0
 #endif
 #endif
 
 
 #ifdef CONFIG_USB_GADGET_S3C2410
 #ifdef CONFIG_USB_GADGET_S3C2410
@@ -198,7 +198,7 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
 		return 0x16;
 		return 0x16;
 	else if (gadget_is_mpc8272(gadget))
 	else if (gadget_is_mpc8272(gadget))
 		return 0x17;
 		return 0x17;
-	else if (gadget_is_husb2dev(gadget))
+	else if (gadget_is_atmel_usba(gadget))
 		return 0x18;
 		return 0x18;
 	else if (gadget_is_fsl_usb2(gadget))
 	else if (gadget_is_fsl_usb2(gadget))
 		return 0x19;
 		return 0x19;