diff options
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index c00cd8b9d3d1..08f699b1fc57 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -235,7 +235,7 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep, | |||
235 | || ep->bEndpointAddress != desc->bEndpointAddress | 235 | || ep->bEndpointAddress != desc->bEndpointAddress |
236 | || ep->fifo_size < le16_to_cpu | 236 | || ep->fifo_size < le16_to_cpu |
237 | (desc->wMaxPacketSize)) { | 237 | (desc->wMaxPacketSize)) { |
238 | DMSG("%s, bad ep or descriptor\n", __FUNCTION__); | 238 | DMSG("%s, bad ep or descriptor\n", __func__); |
239 | return -EINVAL; | 239 | return -EINVAL; |
240 | } | 240 | } |
241 | 241 | ||
@@ -243,7 +243,7 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep, | |||
243 | if (ep->bmAttributes != desc->bmAttributes | 243 | if (ep->bmAttributes != desc->bmAttributes |
244 | && ep->bmAttributes != USB_ENDPOINT_XFER_BULK | 244 | && ep->bmAttributes != USB_ENDPOINT_XFER_BULK |
245 | && desc->bmAttributes != USB_ENDPOINT_XFER_INT) { | 245 | && desc->bmAttributes != USB_ENDPOINT_XFER_INT) { |
246 | DMSG("%s, %s type mismatch\n", __FUNCTION__, _ep->name); | 246 | DMSG("%s, %s type mismatch\n", __func__, _ep->name); |
247 | return -EINVAL; | 247 | return -EINVAL; |
248 | } | 248 | } |
249 | 249 | ||
@@ -252,13 +252,13 @@ static int pxa2xx_ep_enable (struct usb_ep *_ep, | |||
252 | && le16_to_cpu (desc->wMaxPacketSize) | 252 | && le16_to_cpu (desc->wMaxPacketSize) |
253 | != BULK_FIFO_SIZE) | 253 | != BULK_FIFO_SIZE) |
254 | || !desc->wMaxPacketSize) { | 254 | || !desc->wMaxPacketSize) { |
255 | DMSG("%s, bad %s maxpacket\n", __FUNCTION__, _ep->name); | 255 | DMSG("%s, bad %s maxpacket\n", __func__, _ep->name); |
256 | return -ERANGE; | 256 | return -ERANGE; |
257 | } | 257 | } |
258 | 258 | ||
259 | dev = ep->dev; | 259 | dev = ep->dev; |
260 | if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) { | 260 | if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) { |
261 | DMSG("%s, bogus device state\n", __FUNCTION__); | 261 | DMSG("%s, bogus device state\n", __func__); |
262 | return -ESHUTDOWN; | 262 | return -ESHUTDOWN; |
263 | } | 263 | } |
264 | 264 | ||
@@ -283,7 +283,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep) | |||
283 | 283 | ||
284 | ep = container_of (_ep, struct pxa2xx_ep, ep); | 284 | ep = container_of (_ep, struct pxa2xx_ep, ep); |
285 | if (!_ep || !ep->desc) { | 285 | if (!_ep || !ep->desc) { |
286 | DMSG("%s, %s not enabled\n", __FUNCTION__, | 286 | DMSG("%s, %s not enabled\n", __func__, |
287 | _ep ? ep->ep.name : NULL); | 287 | _ep ? ep->ep.name : NULL); |
288 | return -EINVAL; | 288 | return -EINVAL; |
289 | } | 289 | } |
@@ -461,7 +461,7 @@ void ep0start(struct pxa2xx_udc *dev, u32 flags, const char *tag) | |||
461 | USIR0 = USIR0_IR0; | 461 | USIR0 = USIR0_IR0; |
462 | dev->req_pending = 0; | 462 | dev->req_pending = 0; |
463 | DBG(DBG_VERY_NOISY, "%s %s, %02x/%02x\n", | 463 | DBG(DBG_VERY_NOISY, "%s %s, %02x/%02x\n", |
464 | __FUNCTION__, tag, UDCCS0, flags); | 464 | __func__, tag, UDCCS0, flags); |
465 | } | 465 | } |
466 | 466 | ||
467 | static int | 467 | static int |
@@ -651,20 +651,20 @@ pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) | |||
651 | req = container_of(_req, struct pxa2xx_request, req); | 651 | req = container_of(_req, struct pxa2xx_request, req); |
652 | if (unlikely (!_req || !_req->complete || !_req->buf | 652 | if (unlikely (!_req || !_req->complete || !_req->buf |
653 | || !list_empty(&req->queue))) { | 653 | || !list_empty(&req->queue))) { |
654 | DMSG("%s, bad params\n", __FUNCTION__); | 654 | DMSG("%s, bad params\n", __func__); |
655 | return -EINVAL; | 655 | return -EINVAL; |
656 | } | 656 | } |
657 | 657 | ||
658 | ep = container_of(_ep, struct pxa2xx_ep, ep); | 658 | ep = container_of(_ep, struct pxa2xx_ep, ep); |
659 | if (unlikely (!_ep || (!ep->desc && ep->ep.name != ep0name))) { | 659 | if (unlikely (!_ep || (!ep->desc && ep->ep.name != ep0name))) { |
660 | DMSG("%s, bad ep\n", __FUNCTION__); | 660 | DMSG("%s, bad ep\n", __func__); |
661 | return -EINVAL; | 661 | return -EINVAL; |
662 | } | 662 | } |
663 | 663 | ||
664 | dev = ep->dev; | 664 | dev = ep->dev; |
665 | if (unlikely (!dev->driver | 665 | if (unlikely (!dev->driver |
666 | || dev->gadget.speed == USB_SPEED_UNKNOWN)) { | 666 | || dev->gadget.speed == USB_SPEED_UNKNOWN)) { |
667 | DMSG("%s, bogus device state\n", __FUNCTION__); | 667 | DMSG("%s, bogus device state\n", __func__); |
668 | return -ESHUTDOWN; | 668 | return -ESHUTDOWN; |
669 | } | 669 | } |
670 | 670 | ||
@@ -807,7 +807,7 @@ static int pxa2xx_ep_set_halt(struct usb_ep *_ep, int value) | |||
807 | if (unlikely (!_ep | 807 | if (unlikely (!_ep |
808 | || (!ep->desc && ep->ep.name != ep0name)) | 808 | || (!ep->desc && ep->ep.name != ep0name)) |
809 | || ep->bmAttributes == USB_ENDPOINT_XFER_ISOC) { | 809 | || ep->bmAttributes == USB_ENDPOINT_XFER_ISOC) { |
810 | DMSG("%s, bad ep\n", __FUNCTION__); | 810 | DMSG("%s, bad ep\n", __func__); |
811 | return -EINVAL; | 811 | return -EINVAL; |
812 | } | 812 | } |
813 | if (value == 0) { | 813 | if (value == 0) { |
@@ -859,7 +859,7 @@ static int pxa2xx_ep_fifo_status(struct usb_ep *_ep) | |||
859 | 859 | ||
860 | ep = container_of(_ep, struct pxa2xx_ep, ep); | 860 | ep = container_of(_ep, struct pxa2xx_ep, ep); |
861 | if (!_ep) { | 861 | if (!_ep) { |
862 | DMSG("%s, bad ep\n", __FUNCTION__); | 862 | DMSG("%s, bad ep\n", __func__); |
863 | return -ENODEV; | 863 | return -ENODEV; |
864 | } | 864 | } |
865 | /* pxa can't report unclaimed bytes from IN fifos */ | 865 | /* pxa can't report unclaimed bytes from IN fifos */ |
@@ -878,7 +878,7 @@ static void pxa2xx_ep_fifo_flush(struct usb_ep *_ep) | |||
878 | 878 | ||
879 | ep = container_of(_ep, struct pxa2xx_ep, ep); | 879 | ep = container_of(_ep, struct pxa2xx_ep, ep); |
880 | if (!_ep || ep->ep.name == ep0name || !list_empty(&ep->queue)) { | 880 | if (!_ep || ep->ep.name == ep0name || !list_empty(&ep->queue)) { |
881 | DMSG("%s, bad ep\n", __FUNCTION__); | 881 | DMSG("%s, bad ep\n", __func__); |
882 | return; | 882 | return; |
883 | } | 883 | } |
884 | 884 | ||
@@ -1813,7 +1813,7 @@ pxa2xx_udc_irq(int irq, void *_dev) | |||
1813 | 1813 | ||
1814 | static void nop_release (struct device *dev) | 1814 | static void nop_release (struct device *dev) |
1815 | { | 1815 | { |
1816 | DMSG("%s %s\n", __FUNCTION__, dev->bus_id); | 1816 | DMSG("%s %s\n", __func__, dev->bus_id); |
1817 | } | 1817 | } |
1818 | 1818 | ||
1819 | /* this uses load-time allocation and initialization (instead of | 1819 | /* this uses load-time allocation and initialization (instead of |