diff options
Diffstat (limited to 'drivers/usb/misc/ldusb.c')
-rw-r--r-- | drivers/usb/misc/ldusb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index c730d20eec66..11580e81e2c6 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -231,7 +231,7 @@ static void ld_usb_interrupt_in_callback(struct urb *urb) | |||
231 | goto exit; | 231 | goto exit; |
232 | } else { | 232 | } else { |
233 | dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", | 233 | dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", |
234 | __FUNCTION__, status); | 234 | __func__, status); |
235 | spin_lock(&dev->rbsl); | 235 | spin_lock(&dev->rbsl); |
236 | goto resubmit; /* maybe we can recover */ | 236 | goto resubmit; /* maybe we can recover */ |
237 | } | 237 | } |
@@ -247,7 +247,7 @@ static void ld_usb_interrupt_in_callback(struct urb *urb) | |||
247 | memcpy(actual_buffer+1, dev->interrupt_in_buffer, urb->actual_length); | 247 | memcpy(actual_buffer+1, dev->interrupt_in_buffer, urb->actual_length); |
248 | dev->ring_head = next_ring_head; | 248 | dev->ring_head = next_ring_head; |
249 | dbg_info(&dev->intf->dev, "%s: received %d bytes\n", | 249 | dbg_info(&dev->intf->dev, "%s: received %d bytes\n", |
250 | __FUNCTION__, urb->actual_length); | 250 | __func__, urb->actual_length); |
251 | } else { | 251 | } else { |
252 | dev_warn(&dev->intf->dev, | 252 | dev_warn(&dev->intf->dev, |
253 | "Ring buffer overflow, %d bytes dropped\n", | 253 | "Ring buffer overflow, %d bytes dropped\n", |
@@ -286,7 +286,7 @@ static void ld_usb_interrupt_out_callback(struct urb *urb) | |||
286 | status == -ESHUTDOWN)) | 286 | status == -ESHUTDOWN)) |
287 | dbg_info(&dev->intf->dev, | 287 | dbg_info(&dev->intf->dev, |
288 | "%s - nonzero write interrupt status received: %d\n", | 288 | "%s - nonzero write interrupt status received: %d\n", |
289 | __FUNCTION__, status); | 289 | __func__, status); |
290 | 290 | ||
291 | dev->interrupt_out_busy = 0; | 291 | dev->interrupt_out_busy = 0; |
292 | wake_up_interruptible(&dev->write_wait); | 292 | wake_up_interruptible(&dev->write_wait); |
@@ -309,7 +309,7 @@ static int ld_usb_open(struct inode *inode, struct file *file) | |||
309 | 309 | ||
310 | if (!interface) { | 310 | if (!interface) { |
311 | err("%s - error, can't find device for minor %d\n", | 311 | err("%s - error, can't find device for minor %d\n", |
312 | __FUNCTION__, subminor); | 312 | __func__, subminor); |
313 | return -ENODEV; | 313 | return -ENODEV; |
314 | } | 314 | } |
315 | 315 | ||
@@ -556,7 +556,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, | |||
556 | bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size); | 556 | bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size); |
557 | if (bytes_to_write < count) | 557 | if (bytes_to_write < count) |
558 | dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); | 558 | dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); |
559 | dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __FUNCTION__, count, bytes_to_write); | 559 | dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write); |
560 | 560 | ||
561 | if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { | 561 | if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { |
562 | retval = -EFAULT; | 562 | retval = -EFAULT; |