diff options
Diffstat (limited to 'drivers/usb/serial')
-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 |
6 files changed, 20 insertions, 20 deletions
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; |