git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
gadget
/
legacy
/
cdc2.c
diff --git
a/drivers/usb/gadget/legacy/cdc2.c
b/drivers/usb/gadget/legacy/cdc2.c
index 2e85d947347830b5b09ddf70b43631c85b2489d8..afd3e37921a7d9f1cc879cda5fe64ac5f940b6fa 100644
(file)
--- a/
drivers/usb/gadget/legacy/cdc2.c
+++ b/
drivers/usb/gadget/legacy/cdc2.c
@@
-104,7
+104,7
@@
static struct usb_function_instance *fi_ecm;
/*
* We _always_ have both CDC ECM and CDC ACM functions.
*/
/*
* We _always_ have both CDC ECM and CDC ACM functions.
*/
-static int
__init
cdc_do_config(struct usb_configuration *c)
+static int cdc_do_config(struct usb_configuration *c)
{
int status;
{
int status;
@@
-153,7
+153,7
@@
static struct usb_configuration cdc_config_driver = {
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-static int
__init
cdc_bind(struct usb_composite_dev *cdev)
+static int cdc_bind(struct usb_composite_dev *cdev)
{
struct usb_gadget *gadget = cdev->gadget;
struct f_ecm_opts *ecm_opts;
{
struct usb_gadget *gadget = cdev->gadget;
struct f_ecm_opts *ecm_opts;
@@
-211,7
+211,7
@@
fail:
return status;
}
return status;
}
-static int
__exit
cdc_unbind(struct usb_composite_dev *cdev)
+static int cdc_unbind(struct usb_composite_dev *cdev)
{
usb_put_function(f_acm);
usb_put_function_instance(fi_serial);
{
usb_put_function(f_acm);
usb_put_function_instance(fi_serial);
@@
-222,13
+222,13
@@
static int __exit cdc_unbind(struct usb_composite_dev *cdev)
return 0;
}
return 0;
}
-static
__refdata
struct usb_composite_driver cdc_driver = {
+static struct usb_composite_driver cdc_driver = {
.name = "g_cdc",
.dev = &device_desc,
.strings = dev_strings,
.max_speed = USB_SPEED_HIGH,
.bind = cdc_bind,
.name = "g_cdc",
.dev = &device_desc,
.strings = dev_strings,
.max_speed = USB_SPEED_HIGH,
.bind = cdc_bind,
- .unbind =
__exit_p(cdc_unbind)
,
+ .unbind =
cdc_unbind
,
};
module_usb_composite_driver(cdc_driver);
};
module_usb_composite_driver(cdc_driver);