From: Sebastian Andrzej Siewior Date: Thu, 16 Jun 2011 18:36:57 +0000 (+0200) Subject: usb: gadget: dummy_hcd: use gadget_to_dummy_hcd() where possible X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=719e52cbc7b826fae9501f3b86b8cbc25a4c5268;p=mv-sheeva.git 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 Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 834fb923a06..1fc80bb8ca3 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) dum = ep_to_dummy (ep); if (!dum->driver) return -ESHUTDOWN; - if (dum->gadget.speed == USB_SPEED_SUPER) - dum_hcd = dum->ss_hcd; - else - dum_hcd = dum->hs_hcd; + + dum_hcd = gadget_to_dummy_hcd(&dum->gadget); if (!is_enabled(dum_hcd)) return -ESHUTDOWN; @@ -631,10 +629,7 @@ dummy_queue (struct usb_ep *_ep, struct usb_request *_req, return -EINVAL; dum = ep_to_dummy (ep); - if (dum->gadget.speed == USB_SPEED_SUPER) - dum_hcd = dum->ss_hcd; - else - dum_hcd = dum->hs_hcd; + dum_hcd = gadget_to_dummy_hcd(&dum->gadget); if (!dum->driver || !is_enabled(dum_hcd)) return -ESHUTDOWN;