diff options
Diffstat (limited to 'drivers/usb/core/message.c')
-rw-r--r-- | drivers/usb/core/message.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 5b23f6b017d..e819e5359d5 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -312,7 +312,7 @@ static void sg_complete(struct urb *urb) | |||
312 | retval != -EBUSY) | 312 | retval != -EBUSY) |
313 | dev_err(&io->dev->dev, | 313 | dev_err(&io->dev->dev, |
314 | "%s, unlink --> %d\n", | 314 | "%s, unlink --> %d\n", |
315 | __FUNCTION__, retval); | 315 | __func__, retval); |
316 | } else if (urb == io->urbs [i]) | 316 | } else if (urb == io->urbs [i]) |
317 | found = 1; | 317 | found = 1; |
318 | } | 318 | } |
@@ -550,7 +550,7 @@ void usb_sg_wait(struct usb_sg_request *io) | |||
550 | io->urbs[i]->dev = NULL; | 550 | io->urbs[i]->dev = NULL; |
551 | io->urbs[i]->status = retval; | 551 | io->urbs[i]->status = retval; |
552 | dev_dbg(&io->dev->dev, "%s, submit --> %d\n", | 552 | dev_dbg(&io->dev->dev, "%s, submit --> %d\n", |
553 | __FUNCTION__, retval); | 553 | __func__, retval); |
554 | usb_sg_cancel(io); | 554 | usb_sg_cancel(io); |
555 | } | 555 | } |
556 | spin_lock_irq(&io->lock); | 556 | spin_lock_irq(&io->lock); |
@@ -600,7 +600,7 @@ void usb_sg_cancel(struct usb_sg_request *io) | |||
600 | retval = usb_unlink_urb(io->urbs [i]); | 600 | retval = usb_unlink_urb(io->urbs [i]); |
601 | if (retval != -EINPROGRESS && retval != -EBUSY) | 601 | if (retval != -EINPROGRESS && retval != -EBUSY) |
602 | dev_warn(&io->dev->dev, "%s, unlink --> %d\n", | 602 | dev_warn(&io->dev->dev, "%s, unlink --> %d\n", |
603 | __FUNCTION__, retval); | 603 | __func__, retval); |
604 | } | 604 | } |
605 | spin_lock(&io->lock); | 605 | spin_lock(&io->lock); |
606 | } | 606 | } |
@@ -1068,7 +1068,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) | |||
1068 | { | 1068 | { |
1069 | int i; | 1069 | int i; |
1070 | 1070 | ||
1071 | dev_dbg(&dev->dev, "%s nuking %s URBs\n", __FUNCTION__, | 1071 | dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__, |
1072 | skip_ep0 ? "non-ep0" : "all"); | 1072 | skip_ep0 ? "non-ep0" : "all"); |
1073 | for (i = skip_ep0; i < 16; ++i) { | 1073 | for (i = skip_ep0; i < 16; ++i) { |
1074 | usb_disable_endpoint(dev, i); | 1074 | usb_disable_endpoint(dev, i); |