projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb gadget: don't save bind callback in struct usb_composite_driver
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
usb
/
gadget
/
zero.c
diff --git
a/drivers/usb/gadget/zero.c
b/drivers/usb/gadget/zero.c
index
cf35392
..
6d16db9
100644
(file)
--- a/
drivers/usb/gadget/zero.c
+++ b/
drivers/usb/gadget/zero.c
@@
-264,7
+264,7
@@
static void zero_resume(struct usb_composite_dev *cdev)
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-static int __
ref
zero_bind(struct usb_composite_dev *cdev)
+static int __
init
zero_bind(struct usb_composite_dev *cdev)
{
int gcnum;
struct usb_gadget *gadget = cdev->gadget;
{
int gcnum;
struct usb_gadget *gadget = cdev->gadget;
@@
-340,7
+340,6
@@
static struct usb_composite_driver zero_driver = {
.name = "zero",
.dev = &device_desc,
.strings = dev_strings,
.name = "zero",
.dev = &device_desc,
.strings = dev_strings,
- .bind = zero_bind,
.unbind = zero_unbind,
.suspend = zero_suspend,
.resume = zero_resume,
.unbind = zero_unbind,
.suspend = zero_suspend,
.resume = zero_resume,
@@
-351,7
+350,7
@@
MODULE_LICENSE("GPL");
static int __init init(void)
{
static int __init init(void)
{
- return usb_composite_
register(&zero_driver
);
+ return usb_composite_
probe(&zero_driver, zero_bind
);
}
module_init(init);
}
module_init(init);