diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 34 | ||||
-rw-r--r-- | drivers/usb/core/endpoint.c | 2 | ||||
-rw-r--r-- | drivers/usb/core/message.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/adutux.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/iowarrior.c | 8 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetmotorcontrol.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/io_edgeport.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ipw.c | 18 | ||||
-rw-r--r-- | drivers/usb/serial/mos7720.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/oti6858.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/sierra.c | 10 |
13 files changed, 48 insertions, 48 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index f51e22490edf..912d97aaf9bf 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb) | |||
332 | return; | 332 | return; |
333 | 333 | ||
334 | if (status) | 334 | if (status) |
335 | dev_dbg(&acm->data->dev, "bulk rx status %d", status); | 335 | dev_dbg(&acm->data->dev, "bulk rx status %d\n", status); |
336 | 336 | ||
337 | buf = rcv->buffer; | 337 | buf = rcv->buffer; |
338 | buf->size = urb->actual_length; | 338 | buf->size = urb->actual_length; |
@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf, | |||
831 | 831 | ||
832 | /* normal probing*/ | 832 | /* normal probing*/ |
833 | if (!buffer) { | 833 | if (!buffer) { |
834 | err("Wierd descriptor references\n"); | 834 | err("Weird descriptor references\n"); |
835 | return -EINVAL; | 835 | return -EINVAL; |
836 | } | 836 | } |
837 | 837 | ||
838 | if (!buflen) { | 838 | if (!buflen) { |
839 | if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { | 839 | if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { |
840 | dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint"); | 840 | dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n"); |
841 | buflen = intf->cur_altsetting->endpoint->extralen; | 841 | buflen = intf->cur_altsetting->endpoint->extralen; |
842 | buffer = intf->cur_altsetting->endpoint->extra; | 842 | buffer = intf->cur_altsetting->endpoint->extra; |
843 | } else { | 843 | } else { |
@@ -887,24 +887,24 @@ next_desc: | |||
887 | 887 | ||
888 | if (!union_header) { | 888 | if (!union_header) { |
889 | if (call_interface_num > 0) { | 889 | if (call_interface_num > 0) { |
890 | dev_dbg(&intf->dev,"No union descriptor, using call management descriptor"); | 890 | dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n"); |
891 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); | 891 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); |
892 | control_interface = intf; | 892 | control_interface = intf; |
893 | } else { | 893 | } else { |
894 | dev_dbg(&intf->dev,"No union descriptor, giving up"); | 894 | dev_dbg(&intf->dev,"No union descriptor, giving up\n"); |
895 | return -ENODEV; | 895 | return -ENODEV; |
896 | } | 896 | } |
897 | } else { | 897 | } else { |
898 | control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); | 898 | control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); |
899 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); | 899 | data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); |
900 | if (!control_interface || !data_interface) { | 900 | if (!control_interface || !data_interface) { |
901 | dev_dbg(&intf->dev,"no interfaces"); | 901 | dev_dbg(&intf->dev,"no interfaces\n"); |
902 | return -ENODEV; | 902 | return -ENODEV; |
903 | } | 903 | } |
904 | } | 904 | } |
905 | 905 | ||
906 | if (data_interface_num != call_interface_num) | 906 | if (data_interface_num != call_interface_num) |
907 | dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported."); | 907 | dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n"); |
908 | 908 | ||
909 | skip_normal_probe: | 909 | skip_normal_probe: |
910 | 910 | ||
@@ -912,7 +912,7 @@ skip_normal_probe: | |||
912 | if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { | 912 | if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { |
913 | if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { | 913 | if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { |
914 | struct usb_interface *t; | 914 | struct usb_interface *t; |
915 | dev_dbg(&intf->dev,"Your device has switched interfaces."); | 915 | dev_dbg(&intf->dev,"Your device has switched interfaces.\n"); |
916 | 916 | ||
917 | t = control_interface; | 917 | t = control_interface; |
918 | control_interface = data_interface; | 918 | control_interface = data_interface; |
@@ -927,7 +927,7 @@ skip_normal_probe: | |||
927 | return -ENODEV; | 927 | return -ENODEV; |
928 | 928 | ||
929 | if (usb_interface_claimed(data_interface)) { /* valid in this context */ | 929 | if (usb_interface_claimed(data_interface)) { /* valid in this context */ |
930 | dev_dbg(&intf->dev,"The data interface isn't available"); | 930 | dev_dbg(&intf->dev,"The data interface isn't available\n"); |
931 | return -EBUSY; | 931 | return -EBUSY; |
932 | } | 932 | } |
933 | 933 | ||
@@ -944,7 +944,7 @@ skip_normal_probe: | |||
944 | if (!usb_endpoint_dir_in(epread)) { | 944 | if (!usb_endpoint_dir_in(epread)) { |
945 | /* descriptors are swapped */ | 945 | /* descriptors are swapped */ |
946 | struct usb_endpoint_descriptor *t; | 946 | struct usb_endpoint_descriptor *t; |
947 | dev_dbg(&intf->dev,"The data interface has switched endpoints"); | 947 | dev_dbg(&intf->dev,"The data interface has switched endpoints\n"); |
948 | 948 | ||
949 | t = epread; | 949 | t = epread; |
950 | epread = epwrite; | 950 | epread = epwrite; |
@@ -959,7 +959,7 @@ skip_normal_probe: | |||
959 | } | 959 | } |
960 | 960 | ||
961 | if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { | 961 | if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { |
962 | dev_dbg(&intf->dev, "out of memory (acm kzalloc)"); | 962 | dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n"); |
963 | goto alloc_fail; | 963 | goto alloc_fail; |
964 | } | 964 | } |
965 | 965 | ||
@@ -985,26 +985,26 @@ skip_normal_probe: | |||
985 | 985 | ||
986 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); | 986 | buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); |
987 | if (!buf) { | 987 | if (!buf) { |
988 | dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)"); | 988 | dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n"); |
989 | goto alloc_fail2; | 989 | goto alloc_fail2; |
990 | } | 990 | } |
991 | acm->ctrl_buffer = buf; | 991 | acm->ctrl_buffer = buf; |
992 | 992 | ||
993 | if (acm_write_buffers_alloc(acm) < 0) { | 993 | if (acm_write_buffers_alloc(acm) < 0) { |
994 | dev_dbg(&intf->dev, "out of memory (write buffer alloc)"); | 994 | dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n"); |
995 | goto alloc_fail4; | 995 | goto alloc_fail4; |
996 | } | 996 | } |
997 | 997 | ||
998 | acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); | 998 | acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); |
999 | if (!acm->ctrlurb) { | 999 | if (!acm->ctrlurb) { |
1000 | dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)"); | 1000 | dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n"); |
1001 | goto alloc_fail5; | 1001 | goto alloc_fail5; |
1002 | } | 1002 | } |
1003 | for (i = 0; i < num_rx_buf; i++) { | 1003 | for (i = 0; i < num_rx_buf; i++) { |
1004 | struct acm_ru *rcv = &(acm->ru[i]); | 1004 | struct acm_ru *rcv = &(acm->ru[i]); |
1005 | 1005 | ||
1006 | if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { | 1006 | if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { |
1007 | dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)"); | 1007 | dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n"); |
1008 | goto alloc_fail7; | 1008 | goto alloc_fail7; |
1009 | } | 1009 | } |
1010 | 1010 | ||
@@ -1015,13 +1015,13 @@ skip_normal_probe: | |||
1015 | struct acm_rb *buf = &(acm->rb[i]); | 1015 | struct acm_rb *buf = &(acm->rb[i]); |
1016 | 1016 | ||
1017 | if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { | 1017 | if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { |
1018 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)"); | 1018 | dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n"); |
1019 | goto alloc_fail7; | 1019 | goto alloc_fail7; |
1020 | } | 1020 | } |
1021 | } | 1021 | } |
1022 | acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); | 1022 | acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); |
1023 | if (!acm->writeurb) { | 1023 | if (!acm->writeurb) { |
1024 | dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)"); | 1024 | dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n"); |
1025 | goto alloc_fail7; | 1025 | goto alloc_fail7; |
1026 | } | 1026 | } |
1027 | 1027 | ||
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index 7dc123d6b2d0..99e5a68a3f12 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
@@ -291,7 +291,7 @@ int usb_create_ep_files(struct device *parent, | |||
291 | 291 | ||
292 | retval = endpoint_get_minor(ep_dev); | 292 | retval = endpoint_get_minor(ep_dev); |
293 | if (retval) { | 293 | if (retval) { |
294 | dev_err(parent, "can not allocate minor number for %s", | 294 | dev_err(parent, "can not allocate minor number for %s\n", |
295 | ep_dev->dev.bus_id); | 295 | ep_dev->dev.bus_id); |
296 | goto error_register; | 296 | goto error_register; |
297 | } | 297 | } |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index c021af390372..8dd5a6afd513 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1526,7 +1526,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) | |||
1526 | new_interfaces = kmalloc(nintf * sizeof(*new_interfaces), | 1526 | new_interfaces = kmalloc(nintf * sizeof(*new_interfaces), |
1527 | GFP_KERNEL); | 1527 | GFP_KERNEL); |
1528 | if (!new_interfaces) { | 1528 | if (!new_interfaces) { |
1529 | dev_err(&dev->dev, "Out of memory"); | 1529 | dev_err(&dev->dev, "Out of memory\n"); |
1530 | return -ENOMEM; | 1530 | return -ENOMEM; |
1531 | } | 1531 | } |
1532 | 1532 | ||
@@ -1535,7 +1535,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) | |||
1535 | sizeof(struct usb_interface), | 1535 | sizeof(struct usb_interface), |
1536 | GFP_KERNEL); | 1536 | GFP_KERNEL); |
1537 | if (!new_interfaces[n]) { | 1537 | if (!new_interfaces[n]) { |
1538 | dev_err(&dev->dev, "Out of memory"); | 1538 | dev_err(&dev->dev, "Out of memory\n"); |
1539 | ret = -ENOMEM; | 1539 | ret = -ENOMEM; |
1540 | free_interfaces: | 1540 | free_interfaces: |
1541 | while (--n >= 0) | 1541 | while (--n >= 0) |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 6829814b7aaf..44b79e8a6e25 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
@@ -358,7 +358,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver, | |||
358 | hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; | 358 | hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; |
359 | 359 | ||
360 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { | 360 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { |
361 | dev_err(&dev->dev, "request_mem_region failed"); | 361 | dev_err(&dev->dev, "request_mem_region failed\n"); |
362 | retval = -EBUSY; | 362 | retval = -EBUSY; |
363 | goto err_put; | 363 | goto err_put; |
364 | } | 364 | } |
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 5131cbfb2f52..c567aa7a41ea 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -805,7 +805,7 @@ static int adu_probe(struct usb_interface *interface, | |||
805 | dev->minor = interface->minor; | 805 | dev->minor = interface->minor; |
806 | 806 | ||
807 | /* let the user know what node this device is now attached to */ | 807 | /* let the user know what node this device is now attached to */ |
808 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d", | 808 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n", |
809 | udev->descriptor.idProduct, dev->serial_number, | 809 | udev->descriptor.idProduct, dev->serial_number, |
810 | (dev->minor - ADU_MINOR_BASE)); | 810 | (dev->minor - ADU_MINOR_BASE)); |
811 | exit: | 811 | exit: |
@@ -851,7 +851,7 @@ static void adu_disconnect(struct usb_interface *interface) | |||
851 | mutex_unlock(&dev->mtx); | 851 | mutex_unlock(&dev->mtx); |
852 | } | 852 | } |
853 | 853 | ||
854 | dev_info(&interface->dev, "ADU device adutux%d now disconnected", | 854 | dev_info(&interface->dev, "ADU device adutux%d now disconnected\n", |
855 | (minor - ADU_MINOR_BASE)); | 855 | (minor - ADU_MINOR_BASE)); |
856 | 856 | ||
857 | dbg(2," %s : leave", __FUNCTION__); | 857 | dbg(2," %s : leave", __FUNCTION__); |
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index 46d9f27ec173..d372fbc4effb 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -216,7 +216,7 @@ static void iowarrior_callback(struct urb *urb) | |||
216 | exit: | 216 | exit: |
217 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 217 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
218 | if (retval) | 218 | if (retval) |
219 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d", | 219 | dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d\n", |
220 | __FUNCTION__, retval); | 220 | __FUNCTION__, retval); |
221 | 221 | ||
222 | } | 222 | } |
@@ -451,7 +451,7 @@ static ssize_t iowarrior_write(struct file *file, | |||
451 | break; | 451 | break; |
452 | default: | 452 | default: |
453 | /* what do we have here ? An unsupported Product-ID ? */ | 453 | /* what do we have here ? An unsupported Product-ID ? */ |
454 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x", | 454 | dev_err(&dev->interface->dev, "%s - not supported for product=0x%x\n", |
455 | __FUNCTION__, dev->product_id); | 455 | __FUNCTION__, dev->product_id); |
456 | retval = -EFAULT; | 456 | retval = -EFAULT; |
457 | goto exit; | 457 | goto exit; |
@@ -526,7 +526,7 @@ static int iowarrior_ioctl(struct inode *inode, struct file *file, | |||
526 | } else { | 526 | } else { |
527 | retval = -EINVAL; | 527 | retval = -EINVAL; |
528 | dev_err(&dev->interface->dev, | 528 | dev_err(&dev->interface->dev, |
529 | "ioctl 'IOW_WRITE' is not supported for product=0x%x.", | 529 | "ioctl 'IOW_WRITE' is not supported for product=0x%x.\n", |
530 | dev->product_id); | 530 | dev->product_id); |
531 | } | 531 | } |
532 | break; | 532 | break; |
@@ -752,7 +752,7 @@ static int iowarrior_probe(struct usb_interface *interface, | |||
752 | /* allocate memory for our device state and intialize it */ | 752 | /* allocate memory for our device state and intialize it */ |
753 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); | 753 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); |
754 | if (dev == NULL) { | 754 | if (dev == NULL) { |
755 | dev_err(&interface->dev, "Out of memory"); | 755 | dev_err(&interface->dev, "Out of memory\n"); |
756 | return retval; | 756 | return retval; |
757 | } | 757 | } |
758 | 758 | ||
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index df0ebcdb9d6a..2ad09b1f4848 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
@@ -155,7 +155,7 @@ resubmit: | |||
155 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 155 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
156 | if (retval) | 156 | if (retval) |
157 | dev_err(&mc->intf->dev, | 157 | dev_err(&mc->intf->dev, |
158 | "can't resubmit intr, %s-%s/motorcontrol0, retval %d", | 158 | "can't resubmit intr, %s-%s/motorcontrol0, retval %d\n", |
159 | mc->udev->bus->bus_name, | 159 | mc->udev->bus->bus_name, |
160 | mc->udev->devpath, retval); | 160 | mc->udev->devpath, retval); |
161 | } | 161 | } |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e4c248c98e84..65257867b34b 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1071,7 +1071,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a | |||
1071 | (char*) &latency, 1, WDR_TIMEOUT); | 1071 | (char*) &latency, 1, WDR_TIMEOUT); |
1072 | 1072 | ||
1073 | if (rv < 0) { | 1073 | if (rv < 0) { |
1074 | dev_err(dev, "Unable to read latency timer: %i", rv); | 1074 | dev_err(dev, "Unable to read latency timer: %i\n", rv); |
1075 | return -EIO; | 1075 | return -EIO; |
1076 | } | 1076 | } |
1077 | return sprintf(buf, "%i\n", latency); | 1077 | return sprintf(buf, "%i\n", latency); |
@@ -1098,7 +1098,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute * | |||
1098 | buf, 0, WDR_TIMEOUT); | 1098 | buf, 0, WDR_TIMEOUT); |
1099 | 1099 | ||
1100 | if (rv < 0) { | 1100 | if (rv < 0) { |
1101 | dev_err(dev, "Unable to write latency timer: %i", rv); | 1101 | dev_err(dev, "Unable to write latency timer: %i\n", rv); |
1102 | return -EIO; | 1102 | return -EIO; |
1103 | } | 1103 | } |
1104 | 1104 | ||
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 2ecb1d2a034d..8dd3abc99d63 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2882,7 +2882,7 @@ static int edge_startup (struct usb_serial *serial) | |||
2882 | (edge_serial->product_info.NumPorts != serial->num_ports)) { | 2882 | (edge_serial->product_info.NumPorts != serial->num_ports)) { |
2883 | dev_warn(&serial->dev->dev, "Device Reported %d serial ports " | 2883 | dev_warn(&serial->dev->dev, "Device Reported %d serial ports " |
2884 | "vs. core thinking we have %d ports, email " | 2884 | "vs. core thinking we have %d ports, email " |
2885 | "greg@kroah.com this information.", | 2885 | "greg@kroah.com this information.\n", |
2886 | edge_serial->product_info.NumPorts, | 2886 | edge_serial->product_info.NumPorts, |
2887 | serial->num_ports); | 2887 | serial->num_ports); |
2888 | } | 2888 | } |
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 1b94daa61584..cbe5530f3db2 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
@@ -227,7 +227,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
227 | 0, | 227 | 0, |
228 | 100000); | 228 | 100000); |
229 | if (result < 0) | 229 | if (result < 0) |
230 | dev_err(&port->dev, "Init of modem failed (error = %d)", result); | 230 | dev_err(&port->dev, "Init of modem failed (error = %d)\n", result); |
231 | 231 | ||
232 | /* reset the bulk pipes */ | 232 | /* reset the bulk pipes */ |
233 | usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress)); | 233 | usb_clear_halt(dev, usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress)); |
@@ -255,7 +255,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
255 | 0, | 255 | 0, |
256 | 100000); | 256 | 100000); |
257 | if (result < 0) | 257 | if (result < 0) |
258 | dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)", result); | 258 | dev_err(&port->dev, "Enabling bulk RxRead failed (error = %d)\n", result); |
259 | 259 | ||
260 | /*--4: setup the initial flowcontrol */ | 260 | /*--4: setup the initial flowcontrol */ |
261 | dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init); | 261 | dbg("%s:setting init flowcontrol (%s)",__FUNCTION__,buf_flow_init); |
@@ -268,7 +268,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
268 | 0x10, | 268 | 0x10, |
269 | 200000); | 269 | 200000); |
270 | if (result < 0) | 270 | if (result < 0) |
271 | dev_err(&port->dev, "initial flowcontrol failed (error = %d)", result); | 271 | dev_err(&port->dev, "initial flowcontrol failed (error = %d)\n", result); |
272 | 272 | ||
273 | 273 | ||
274 | /*--5: raise the dtr */ | 274 | /*--5: raise the dtr */ |
@@ -282,7 +282,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
282 | 0, | 282 | 0, |
283 | 200000); | 283 | 200000); |
284 | if (result < 0) | 284 | if (result < 0) |
285 | dev_err(&port->dev, "setting dtr failed (error = %d)", result); | 285 | dev_err(&port->dev, "setting dtr failed (error = %d)\n", result); |
286 | 286 | ||
287 | /*--6: raise the rts */ | 287 | /*--6: raise the rts */ |
288 | dbg("%s:raising rts",__FUNCTION__); | 288 | dbg("%s:raising rts",__FUNCTION__); |
@@ -295,7 +295,7 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp) | |||
295 | 0, | 295 | 0, |
296 | 200000); | 296 | 200000); |
297 | if (result < 0) | 297 | if (result < 0) |
298 | dev_err(&port->dev, "setting dtr failed (error = %d)", result); | 298 | dev_err(&port->dev, "setting dtr failed (error = %d)\n", result); |
299 | 299 | ||
300 | kfree(buf_flow_init); | 300 | kfree(buf_flow_init); |
301 | return 0; | 301 | return 0; |
@@ -322,7 +322,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
322 | 0, | 322 | 0, |
323 | 200000); | 323 | 200000); |
324 | if (result < 0) | 324 | if (result < 0) |
325 | dev_err(&port->dev, "dropping dtr failed (error = %d)", result); | 325 | dev_err(&port->dev, "dropping dtr failed (error = %d)\n", result); |
326 | 326 | ||
327 | /*--2: drop the rts */ | 327 | /*--2: drop the rts */ |
328 | dbg("%s:dropping rts",__FUNCTION__); | 328 | dbg("%s:dropping rts",__FUNCTION__); |
@@ -334,7 +334,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
334 | 0, | 334 | 0, |
335 | 200000); | 335 | 200000); |
336 | if (result < 0) | 336 | if (result < 0) |
337 | dev_err(&port->dev, "dropping rts failed (error = %d)", result); | 337 | dev_err(&port->dev, "dropping rts failed (error = %d)\n", result); |
338 | 338 | ||
339 | 339 | ||
340 | /*--3: purge */ | 340 | /*--3: purge */ |
@@ -347,7 +347,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
347 | 0, | 347 | 0, |
348 | 200000); | 348 | 200000); |
349 | if (result < 0) | 349 | if (result < 0) |
350 | dev_err(&port->dev, "purge failed (error = %d)", result); | 350 | dev_err(&port->dev, "purge failed (error = %d)\n", result); |
351 | 351 | ||
352 | 352 | ||
353 | /* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */ | 353 | /* send RXBULK_off (tell modem to stop transmitting bulk data on rx chan) */ |
@@ -361,7 +361,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
361 | 100000); | 361 | 100000); |
362 | 362 | ||
363 | if (result < 0) | 363 | if (result < 0) |
364 | dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)", result); | 364 | dev_err(&port->dev, "Disabling bulk RxRead failed (error = %d)\n", result); |
365 | 365 | ||
366 | /* shutdown any in-flight urbs that we know about */ | 366 | /* shutdown any in-flight urbs that we know about */ |
367 | usb_kill_urb(port->read_urb); | 367 | usb_kill_urb(port->read_urb); |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 01e811becec4..e02c198016b0 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -478,7 +478,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) | |||
478 | response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL); | 478 | response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL); |
479 | if (response) | 479 | if (response) |
480 | dev_err(&port->dev, | 480 | dev_err(&port->dev, |
481 | "%s - Error %d submitting control urb", | 481 | "%s - Error %d submitting control urb\n", |
482 | __FUNCTION__, response); | 482 | __FUNCTION__, response); |
483 | } | 483 | } |
484 | 484 | ||
@@ -492,7 +492,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) | |||
492 | response = usb_submit_urb(port->read_urb, GFP_KERNEL); | 492 | response = usb_submit_urb(port->read_urb, GFP_KERNEL); |
493 | if (response) | 493 | if (response) |
494 | dev_err(&port->dev, | 494 | dev_err(&port->dev, |
495 | "%s - Error %d submitting read urb", __FUNCTION__, response); | 495 | "%s - Error %d submitting read urb\n", __FUNCTION__, response); |
496 | 496 | ||
497 | /* initialize our icount structure */ | 497 | /* initialize our icount structure */ |
498 | memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount)); | 498 | memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount)); |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index d19861166b50..eea226ae37bd 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -256,7 +256,7 @@ static void setup_line(struct work_struct *work) | |||
256 | 100); | 256 | 100); |
257 | 257 | ||
258 | if (result != OTI6858_CTRL_PKT_SIZE) { | 258 | if (result != OTI6858_CTRL_PKT_SIZE) { |
259 | dev_err(&port->dev, "%s(): error reading status", __FUNCTION__); | 259 | dev_err(&port->dev, "%s(): error reading status\n", __FUNCTION__); |
260 | kfree(new_setup); | 260 | kfree(new_setup); |
261 | /* we will try again */ | 261 | /* we will try again */ |
262 | schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2)); | 262 | schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2)); |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 0bb8de4cc524..959b3e4e9077 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -48,7 +48,7 @@ enum devicetype { | |||
48 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | 48 | static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) |
49 | { | 49 | { |
50 | int result; | 50 | int result; |
51 | dev_dbg(&udev->dev, "%s", "SET POWER STATE"); | 51 | dev_dbg(&udev->dev, "%s", "SET POWER STATE\n"); |
52 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 52 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
53 | 0x00, /* __u8 request */ | 53 | 0x00, /* __u8 request */ |
54 | 0x40, /* __u8 request type */ | 54 | 0x40, /* __u8 request type */ |
@@ -63,7 +63,7 @@ static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) | |||
63 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode) | 63 | static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSocMode) |
64 | { | 64 | { |
65 | int result; | 65 | int result; |
66 | dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH"); | 66 | dev_dbg(&udev->dev, "%s", "DEVICE MODE SWITCH\n"); |
67 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 67 | result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |
68 | SWIMS_USB_REQUEST_SetMode, /* __u8 request */ | 68 | SWIMS_USB_REQUEST_SetMode, /* __u8 request */ |
69 | SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */ | 69 | SWIMS_USB_REQUEST_TYPE_SetMode, /* __u8 request type */ |
@@ -397,7 +397,7 @@ static void sierra_indat_callback(struct urb *urb) | |||
397 | err = usb_submit_urb(urb, GFP_ATOMIC); | 397 | err = usb_submit_urb(urb, GFP_ATOMIC); |
398 | if (err) | 398 | if (err) |
399 | dev_err(&port->dev, "resubmit read urb failed." | 399 | dev_err(&port->dev, "resubmit read urb failed." |
400 | "(%d)", err); | 400 | "(%d)\n", err); |
401 | } | 401 | } |
402 | } | 402 | } |
403 | return; | 403 | return; |
@@ -525,7 +525,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) | |||
525 | 525 | ||
526 | result = usb_submit_urb(urb, GFP_KERNEL); | 526 | result = usb_submit_urb(urb, GFP_KERNEL); |
527 | if (result) { | 527 | if (result) { |
528 | dev_err(&port->dev, "submit urb %d failed (%d) %d", | 528 | dev_err(&port->dev, "submit urb %d failed (%d) %d\n", |
529 | i, result, urb->transfer_buffer_length); | 529 | i, result, urb->transfer_buffer_length); |
530 | } | 530 | } |
531 | } | 531 | } |
@@ -538,7 +538,7 @@ static int sierra_open(struct usb_serial_port *port, struct file *filp) | |||
538 | if (port->interrupt_in_urb) { | 538 | if (port->interrupt_in_urb) { |
539 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); | 539 | result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); |
540 | if (result) | 540 | if (result) |
541 | dev_err(&port->dev, "submit irq_in urb failed %d", | 541 | dev_err(&port->dev, "submit irq_in urb failed %d\n", |
542 | result); | 542 | result); |
543 | } | 543 | } |
544 | return 0; | 544 | return 0; |