aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-06-16 14:36:57 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 17:31:07 -0400
commit719e52cbc7b826fae9501f3b86b8cbc25a4c5268 (patch)
treea34296697d8f9e26791663e919c88ab0e186240a
parent99fd14080e7f0a65b87830bf5062b09f6e80dd13 (diff)
usb: gadget: dummy_hcd: use gadget_to_dummy_hcd() where possible
gadget_to_dummy_hcd() already does the speed check, so it's unnecessary to unroll that all the time. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/dummy_hcd.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 834fb923a062..1fc80bb8ca39 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -429,10 +429,8 @@ dummy_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
429 dum = ep_to_dummy (ep); 429 dum = ep_to_dummy (ep);
430 if (!dum->driver) 430 if (!dum->driver)
431 return -ESHUTDOWN; 431 return -ESHUTDOWN;
432 if (dum->gadget.speed == USB_SPEED_SUPER) 432
433 dum_hcd = dum->ss_hcd; 433 dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
434 else
435 dum_hcd = dum->hs_hcd;
436 if (!is_enabled(dum_hcd)) 434 if (!is_enabled(dum_hcd))
437 return -ESHUTDOWN; 435 return -ESHUTDOWN;
438 436
@@ -631,10 +629,7 @@ dummy_queue (struct usb_ep *_ep, struct usb_request *_req,
631 return -EINVAL; 629 return -EINVAL;
632 630
633 dum = ep_to_dummy (ep); 631 dum = ep_to_dummy (ep);
634 if (dum->gadget.speed == USB_SPEED_SUPER) 632 dum_hcd = gadget_to_dummy_hcd(&dum->gadget);
635 dum_hcd = dum->ss_hcd;
636 else
637 dum_hcd = dum->hs_hcd;
638 if (!dum->driver || !is_enabled(dum_hcd)) 633 if (!dum->driver || !is_enabled(dum_hcd))
639 return -ESHUTDOWN; 634 return -ESHUTDOWN;
640 635