git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
epautoconf.c
diff --git
a/drivers/usb/gadget/epautoconf.c
b/drivers/usb/gadget/epautoconf.c
index
f7c6d75
..
53d5845
100644
(file)
--- a/
drivers/usb/gadget/epautoconf.c
+++ b/
drivers/usb/gadget/epautoconf.c
@@
-34,12
+34,12
@@
/* we must assign addresses for configurable endpoints (like net2280) */
/* we must assign addresses for configurable endpoints (like net2280) */
-static __initdata unsigned epnum;
+static __
dev
initdata unsigned epnum;
// #define MANY_ENDPOINTS
#ifdef MANY_ENDPOINTS
/* more than 15 configurable endpoints */
// #define MANY_ENDPOINTS
#ifdef MANY_ENDPOINTS
/* more than 15 configurable endpoints */
-static __initdata unsigned in_epnum;
+static __
dev
initdata unsigned in_epnum;
#endif
#endif
@@
-59,7
+59,7
@@
static __initdata unsigned in_epnum;
* NOTE: each endpoint is unidirectional, as specified by its USB
* descriptor; and isn't specific to a configuration or altsetting.
*/
* NOTE: each endpoint is unidirectional, as specified by its USB
* descriptor; and isn't specific to a configuration or altsetting.
*/
-static int __init
+static int __
dev
init
ep_matches (
struct usb_gadget *gadget,
struct usb_ep *ep,
ep_matches (
struct usb_gadget *gadget,
struct usb_ep *ep,
@@
-73,7
+73,7
@@
ep_matches (
/* endpoint already claimed? */
if (0 != ep->driver_data)
return 0;
/* endpoint already claimed? */
if (0 != ep->driver_data)
return 0;
-
+
/* only support ep0 for portable CONTROL traffic */
type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
if (USB_ENDPOINT_XFER_CONTROL == type)
/* only support ep0 for portable CONTROL traffic */
type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
if (USB_ENDPOINT_XFER_CONTROL == type)
@@
-186,7
+186,7
@@
ep_matches (
return 1;
}
return 1;
}
-static struct usb_ep * __init
+static struct usb_ep * __
dev
init
find_ep (struct usb_gadget *gadget, const char *name)
{
struct usb_ep *ep;
find_ep (struct usb_gadget *gadget, const char *name)
{
struct usb_ep *ep;
@@
-228,7
+228,7
@@
find_ep (struct usb_gadget *gadget, const char *name)
*
* On failure, this returns a null endpoint descriptor.
*/
*
* On failure, this returns a null endpoint descriptor.
*/
-struct usb_ep * __init usb_ep_autoconfig (
+struct usb_ep * __
dev
init usb_ep_autoconfig (
struct usb_gadget *gadget,
struct usb_endpoint_descriptor *desc
)
struct usb_gadget *gadget,
struct usb_endpoint_descriptor *desc
)
@@
-276,7
+276,7
@@
struct usb_ep * __init usb_ep_autoconfig (
return ep;
}
return ep;
}
- /* Second, look at endpoints until an unclaimed one looks usable */
+ /* Second, look at endpoints until an unclaimed one looks usable */
list_for_each_entry (ep, &gadget->ep_list, ep_list) {
if (ep_matches (gadget, ep, desc))
return ep;
list_for_each_entry (ep, &gadget->ep_list, ep_list) {
if (ep_matches (gadget, ep, desc))
return ep;
@@
-295,7
+295,7
@@
struct usb_ep * __init usb_ep_autoconfig (
* state such as ep->driver_data and the record of assigned endpoints
* used by usb_ep_autoconfig().
*/
* state such as ep->driver_data and the record of assigned endpoints
* used by usb_ep_autoconfig().
*/
-void __init usb_ep_autoconfig_reset (struct usb_gadget *gadget)
+void __
dev
init usb_ep_autoconfig_reset (struct usb_gadget *gadget)
{
struct usb_ep *ep;
{
struct usb_ep *ep;