diff options
Diffstat (limited to 'drivers/usb/misc/iowarrior.c')
| -rw-r--r-- | drivers/usb/misc/iowarrior.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index 801070502cc1..1cb54a28347f 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
| @@ -154,7 +154,7 @@ MODULE_DEVICE_TABLE(usb, iowarrior_ids); | |||
| 154 | */ | 154 | */ |
| 155 | static void iowarrior_callback(struct urb *urb) | 155 | static void iowarrior_callback(struct urb *urb) |
| 156 | { | 156 | { |
| 157 | struct iowarrior *dev = (struct iowarrior *)urb->context; | 157 | struct iowarrior *dev = urb->context; |
| 158 | int intr_idx; | 158 | int intr_idx; |
| 159 | int read_idx; | 159 | int read_idx; |
| 160 | int aux_idx; | 160 | int aux_idx; |
| @@ -218,7 +218,7 @@ exit: | |||
| 218 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 218 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
| 219 | if (retval) | 219 | if (retval) |
| 220 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n", | 220 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n", |
| 221 | __FUNCTION__, retval); | 221 | __func__, retval); |
| 222 | 222 | ||
| 223 | } | 223 | } |
| 224 | 224 | ||
| @@ -230,7 +230,7 @@ static void iowarrior_write_callback(struct urb *urb) | |||
| 230 | struct iowarrior *dev; | 230 | struct iowarrior *dev; |
| 231 | int status = urb->status; | 231 | int status = urb->status; |
| 232 | 232 | ||
| 233 | dev = (struct iowarrior *)urb->context; | 233 | dev = urb->context; |
| 234 | /* sync/async unlink faults aren't errors */ | 234 | /* sync/async unlink faults aren't errors */ |
| 235 | if (status && | 235 | if (status && |
| 236 | !(status == -ENOENT || | 236 | !(status == -ENOENT || |
| @@ -453,7 +453,7 @@ static ssize_t iowarrior_write(struct file *file, | |||
| 453 | default: | 453 | default: |
| 454 | /* what do we have here ? An unsupported Product-ID ? */ | 454 | /* what do we have here ? An unsupported Product-ID ? */ |
| 455 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n", | 455 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n", |
| 456 | __FUNCTION__, dev->product_id); | 456 | __func__, dev->product_id); |
| 457 | retval = -EFAULT; | 457 | retval = -EFAULT; |
| 458 | goto exit; | 458 | goto exit; |
| 459 | break; | 459 | break; |
| @@ -604,7 +604,7 @@ static int iowarrior_open(struct inode *inode, struct file *file) | |||
| 604 | 604 | ||
| 605 | interface = usb_find_interface(&iowarrior_driver, subminor); | 605 | interface = usb_find_interface(&iowarrior_driver, subminor); |
| 606 | if (!interface) { | 606 | if (!interface) { |
| 607 | err("%s - error, can't find device for minor %d", __FUNCTION__, | 607 | err("%s - error, can't find device for minor %d", __func__, |
| 608 | subminor); | 608 | subminor); |
| 609 | return -ENODEV; | 609 | return -ENODEV; |
| 610 | } | 610 | } |