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: get rid of USB_GADGET_{DUAL,SUPER}SPEED
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
usb
/
gadget
/
composite.c
diff --git
a/drivers/usb/gadget/composite.c
b/drivers/usb/gadget/composite.c
index
3f72110
..
91411a6
100644
(file)
--- a/
drivers/usb/gadget/composite.c
+++ b/
drivers/usb/gadget/composite.c
@@
-300,9
+300,10
@@
int usb_function_deactivate(struct usb_function *function)
int usb_function_activate(struct usb_function *function)
{
struct usb_composite_dev *cdev = function->config->cdev;
int usb_function_activate(struct usb_function *function)
{
struct usb_composite_dev *cdev = function->config->cdev;
+ unsigned long flags;
int status = 0;
int status = 0;
- spin_lock
(&cdev->lock
);
+ spin_lock
_irqsave(&cdev->lock, flags
);
if (WARN_ON(cdev->deactivations == 0))
status = -EINVAL;
if (WARN_ON(cdev->deactivations == 0))
status = -EINVAL;
@@
-312,7
+313,7
@@
int usb_function_activate(struct usb_function *function)
status = usb_gadget_connect(cdev->gadget);
}
status = usb_gadget_connect(cdev->gadget);
}
- spin_unlock
(&cdev->lock
);
+ spin_unlock
_irqrestore(&cdev->lock, flags
);
return status;
}
return status;
}
@@
-1585,12
+1586,6
@@
composite_resume(struct usb_gadget *gadget)
/*-------------------------------------------------------------------------*/
static struct usb_gadget_driver composite_driver = {
/*-------------------------------------------------------------------------*/
static struct usb_gadget_driver composite_driver = {
-#ifdef CONFIG_USB_GADGET_SUPERSPEED
- .max_speed = USB_SPEED_SUPER,
-#else
- .max_speed = USB_SPEED_HIGH,
-#endif
-
.unbind = composite_unbind,
.setup = composite_setup,
.unbind = composite_unbind,
.setup = composite_setup,
@@
-1635,8
+1630,7
@@
int usb_composite_probe(struct usb_composite_driver *driver,
driver->iProduct = driver->name;
composite_driver.function = (char *) driver->name;
composite_driver.driver.name = driver->name;
driver->iProduct = driver->name;
composite_driver.function = (char *) driver->name;
composite_driver.driver.name = driver->name;
- composite_driver.max_speed =
- min_t(u8, composite_driver.max_speed, driver->max_speed);
+ composite_driver.max_speed = driver->max_speed;
composite = driver;
composite_gadget_bind = bind;
composite = driver;
composite_gadget_bind = bind;