diff options
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/cyberjack.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/generic.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/io_edgeport.c | 8 | ||||
| -rw-r--r-- | drivers/usb/serial/io_ti.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 14 | ||||
| -rw-r--r-- | drivers/usb/serial/omninet.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/opticon.c | 4 | ||||
| -rw-r--r-- | drivers/usb/serial/option.c | 4 | ||||
| -rw-r--r-- | drivers/usb/serial/spcp8x5.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/visor.c | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 61e15ef07166..e2600e7ce4ea 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
| @@ -612,7 +612,7 @@ static void cp210x_set_termios(struct tty_struct *tty, | |||
| 612 | baud); | 612 | baud); |
| 613 | if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, | 613 | if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, |
| 614 | ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { | 614 | ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { |
| 615 | dbg("Baud rate requested not supported by device\n"); | 615 | dbg("Baud rate requested not supported by device"); |
| 616 | baud = tty_termios_baud_rate(old_termios); | 616 | baud = tty_termios_baud_rate(old_termios); |
| 617 | } | 617 | } |
| 618 | } | 618 | } |
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 23c8bd6dedeb..036f9996fe52 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
| @@ -391,7 +391,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb) | |||
| 391 | 391 | ||
| 392 | tty = tty_port_tty_get(&port->port); | 392 | tty = tty_port_tty_get(&port->port); |
| 393 | if (!tty) { | 393 | if (!tty) { |
| 394 | dbg("%s - ignoring since device not open\n", __func__); | 394 | dbg("%s - ignoring since device not open", __func__); |
| 395 | return; | 395 | return; |
| 396 | } | 396 | } |
| 397 | if (urb->actual_length) { | 397 | if (urb->actual_length) { |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index d59262ecc229..1c84355a0c80 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -1836,7 +1836,7 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
| 1836 | spin_lock_irqsave(&priv->tx_lock, flags); | 1836 | spin_lock_irqsave(&priv->tx_lock, flags); |
| 1837 | if (priv->tx_outstanding_urbs > URB_UPPER_LIMIT) { | 1837 | if (priv->tx_outstanding_urbs > URB_UPPER_LIMIT) { |
| 1838 | spin_unlock_irqrestore(&priv->tx_lock, flags); | 1838 | spin_unlock_irqrestore(&priv->tx_lock, flags); |
| 1839 | dbg("%s - write limit hit\n", __func__); | 1839 | dbg("%s - write limit hit", __func__); |
| 1840 | return 0; | 1840 | return 0; |
| 1841 | } | 1841 | } |
| 1842 | priv->tx_outstanding_urbs++; | 1842 | priv->tx_outstanding_urbs++; |
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 0b1c4732b878..5288203d883f 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -194,7 +194,7 @@ static int usb_serial_multi_urb_write(struct tty_struct *tty, | |||
| 194 | if (port->urbs_in_flight > | 194 | if (port->urbs_in_flight > |
| 195 | port->serial->type->max_in_flight_urbs) { | 195 | port->serial->type->max_in_flight_urbs) { |
| 196 | spin_unlock_irqrestore(&port->lock, flags); | 196 | spin_unlock_irqrestore(&port->lock, flags); |
| 197 | dbg("%s - write limit hit\n", __func__); | 197 | dbg("%s - write limit hit", __func__); |
| 198 | return bwrite; | 198 | return bwrite; |
| 199 | } | 199 | } |
| 200 | port->tx_bytes_flight += towrite; | 200 | port->tx_bytes_flight += towrite; |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index c055c8ba377d..66fb58f427cd 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
| @@ -1971,7 +1971,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, | |||
| 1971 | return; | 1971 | return; |
| 1972 | 1972 | ||
| 1973 | case IOSP_EXT_STATUS_RX_CHECK_RSP: | 1973 | case IOSP_EXT_STATUS_RX_CHECK_RSP: |
| 1974 | dbg("%s ========== Port %u CHECK_RSP Sequence = %02x =============\n", __func__, edge_serial->rxPort, byte3); | 1974 | dbg("%s ========== Port %u CHECK_RSP Sequence = %02x =============", __func__, edge_serial->rxPort, byte3); |
| 1975 | /* Port->RxCheckRsp = true; */ | 1975 | /* Port->RxCheckRsp = true; */ |
| 1976 | return; | 1976 | return; |
| 1977 | } | 1977 | } |
| @@ -2039,7 +2039,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial, | |||
| 2039 | break; | 2039 | break; |
| 2040 | 2040 | ||
| 2041 | default: | 2041 | default: |
| 2042 | dbg("%s - Unrecognized IOSP status code %u\n", __func__, code); | 2042 | dbg("%s - Unrecognized IOSP status code %u", __func__, code); |
| 2043 | break; | 2043 | break; |
| 2044 | } | 2044 | } |
| 2045 | return; | 2045 | return; |
| @@ -2494,7 +2494,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor) | |||
| 2494 | 2494 | ||
| 2495 | *divisor = custom; | 2495 | *divisor = custom; |
| 2496 | 2496 | ||
| 2497 | dbg("%s - Baud %d = %d\n", __func__, baudrate, custom); | 2497 | dbg("%s - Baud %d = %d", __func__, baudrate, custom); |
| 2498 | return 0; | 2498 | return 0; |
| 2499 | } | 2499 | } |
| 2500 | 2500 | ||
| @@ -2879,7 +2879,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial) | |||
| 2879 | break; | 2879 | break; |
| 2880 | 2880 | ||
| 2881 | case EDGE_DOWNLOAD_FILE_NONE: | 2881 | case EDGE_DOWNLOAD_FILE_NONE: |
| 2882 | dbg ("No download file specified, skipping download\n"); | 2882 | dbg("No download file specified, skipping download"); |
| 2883 | return; | 2883 | return; |
| 2884 | 2884 | ||
| 2885 | default: | 2885 | default: |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 8f0aa64940a6..98e50456ad79 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -1716,7 +1716,7 @@ static void edge_interrupt_callback(struct urb *urb) | |||
| 1716 | case TIUMP_INTERRUPT_CODE_MSR: /* MSR */ | 1716 | case TIUMP_INTERRUPT_CODE_MSR: /* MSR */ |
| 1717 | /* Copy MSR from UMP */ | 1717 | /* Copy MSR from UMP */ |
| 1718 | msr = data[1]; | 1718 | msr = data[1]; |
| 1719 | dbg("%s - ===== Port %u MSR Status = %02x ======\n", | 1719 | dbg("%s - ===== Port %u MSR Status = %02x ======", |
| 1720 | __func__, port_number, msr); | 1720 | __func__, port_number, msr); |
| 1721 | handle_new_msr(edge_port, msr); | 1721 | handle_new_msr(edge_port, msr); |
| 1722 | break; | 1722 | break; |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index e0aa031c5418..546b29f73c2c 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -109,7 +109,7 @@ static void mos7720_interrupt_callback(struct urb *urb) | |||
| 109 | __u8 sp1; | 109 | __u8 sp1; |
| 110 | __u8 sp2; | 110 | __u8 sp2; |
| 111 | 111 | ||
| 112 | dbg("%s", " : Entering\n"); | 112 | dbg(" : Entering"); |
| 113 | 113 | ||
| 114 | switch (status) { | 114 | switch (status) { |
| 115 | case 0: | 115 | case 0: |
| @@ -278,7 +278,7 @@ static void mos7720_bulk_in_callback(struct urb *urb) | |||
| 278 | 278 | ||
| 279 | mos7720_port = urb->context; | 279 | mos7720_port = urb->context; |
| 280 | if (!mos7720_port) { | 280 | if (!mos7720_port) { |
| 281 | dbg("%s", "NULL mos7720_port pointer \n"); | 281 | dbg("NULL mos7720_port pointer"); |
| 282 | return ; | 282 | return ; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| @@ -386,7 +386,7 @@ static int send_mos_cmd(struct usb_serial *serial, __u8 request, __u16 value, | |||
| 386 | } | 386 | } |
| 387 | out: | 387 | out: |
| 388 | if (status < 0) | 388 | if (status < 0) |
| 389 | dbg("Command Write failed Value %x index %x\n", value, index); | 389 | dbg("Command Write failed Value %x index %x", value, index); |
| 390 | 390 | ||
| 391 | return status; | 391 | return status; |
| 392 | } | 392 | } |
| @@ -491,7 +491,7 @@ static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
| 491 | */ | 491 | */ |
| 492 | port_number = port->number - port->serial->minor; | 492 | port_number = port->number - port->serial->minor; |
| 493 | send_mos_cmd(port->serial, MOS_READ, port_number, UART_LSR, &data); | 493 | send_mos_cmd(port->serial, MOS_READ, port_number, UART_LSR, &data); |
| 494 | dbg("SS::%p LSR:%x\n", mos7720_port, data); | 494 | dbg("SS::%p LSR:%x", mos7720_port, data); |
| 495 | 495 | ||
| 496 | dbg("Check:Sending Command .........."); | 496 | dbg("Check:Sending Command .........."); |
| 497 | 497 | ||
| @@ -830,7 +830,7 @@ static void mos7720_throttle(struct tty_struct *tty) | |||
| 830 | struct moschip_port *mos7720_port; | 830 | struct moschip_port *mos7720_port; |
| 831 | int status; | 831 | int status; |
| 832 | 832 | ||
| 833 | dbg("%s- port %d\n", __func__, port->number); | 833 | dbg("%s- port %d", __func__, port->number); |
| 834 | 834 | ||
| 835 | mos7720_port = usb_get_serial_port_data(port); | 835 | mos7720_port = usb_get_serial_port_data(port); |
| 836 | 836 | ||
| @@ -1309,7 +1309,7 @@ static void mos7720_set_termios(struct tty_struct *tty, | |||
| 1309 | return; | 1309 | return; |
| 1310 | } | 1310 | } |
| 1311 | 1311 | ||
| 1312 | dbg("%s\n", "setting termios - ASPIRE"); | 1312 | dbg("setting termios - ASPIRE"); |
| 1313 | 1313 | ||
| 1314 | cflag = tty->termios->c_cflag; | 1314 | cflag = tty->termios->c_cflag; |
| 1315 | 1315 | ||
| @@ -1327,7 +1327,7 @@ static void mos7720_set_termios(struct tty_struct *tty, | |||
| 1327 | change_port_settings(tty, mos7720_port, old_termios); | 1327 | change_port_settings(tty, mos7720_port, old_termios); |
| 1328 | 1328 | ||
| 1329 | if (!port->read_urb) { | 1329 | if (!port->read_urb) { |
| 1330 | dbg("%s", "URB KILLED !!!!!\n"); | 1330 | dbg("URB KILLED !!!!!"); |
| 1331 | return; | 1331 | return; |
| 1332 | } | 1332 | } |
| 1333 | 1333 | ||
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 38762a0fb5bf..7793c4ada038 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
| @@ -332,7 +332,7 @@ static void omninet_write_bulk_callback(struct urb *urb) | |||
| 332 | struct usb_serial_port *port = urb->context; | 332 | struct usb_serial_port *port = urb->context; |
| 333 | int status = urb->status; | 333 | int status = urb->status; |
| 334 | 334 | ||
| 335 | dbg("%s - port %0x\n", __func__, port->number); | 335 | dbg("%s - port %0x", __func__, port->number); |
| 336 | 336 | ||
| 337 | port->write_urb_busy = 0; | 337 | port->write_urb_busy = 0; |
| 338 | if (status) { | 338 | if (status) { |
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index a654317e7d15..773286672ec9 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
| @@ -217,7 +217,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
| 217 | spin_lock_irqsave(&priv->lock, flags); | 217 | spin_lock_irqsave(&priv->lock, flags); |
| 218 | if (priv->outstanding_urbs > URB_UPPER_LIMIT) { | 218 | if (priv->outstanding_urbs > URB_UPPER_LIMIT) { |
| 219 | spin_unlock_irqrestore(&priv->lock, flags); | 219 | spin_unlock_irqrestore(&priv->lock, flags); |
| 220 | dbg("%s - write limit hit\n", __func__); | 220 | dbg("%s - write limit hit", __func__); |
| 221 | return 0; | 221 | return 0; |
| 222 | } | 222 | } |
| 223 | priv->outstanding_urbs++; | 223 | priv->outstanding_urbs++; |
| @@ -288,7 +288,7 @@ static int opticon_write_room(struct tty_struct *tty) | |||
| 288 | spin_lock_irqsave(&priv->lock, flags); | 288 | spin_lock_irqsave(&priv->lock, flags); |
| 289 | if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) { | 289 | if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) { |
| 290 | spin_unlock_irqrestore(&priv->lock, flags); | 290 | spin_unlock_irqrestore(&priv->lock, flags); |
| 291 | dbg("%s - write limit hit\n", __func__); | 291 | dbg("%s - write limit hit", __func__); |
| 292 | return 0; | 292 | return 0; |
| 293 | } | 293 | } |
| 294 | spin_unlock_irqrestore(&priv->lock, flags); | 294 | spin_unlock_irqrestore(&priv->lock, flags); |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 51b0beb39280..f6646b30f954 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -1028,7 +1028,7 @@ static void option_instat_callback(struct urb *urb) | |||
| 1028 | (struct usb_ctrlrequest *)urb->transfer_buffer; | 1028 | (struct usb_ctrlrequest *)urb->transfer_buffer; |
| 1029 | 1029 | ||
| 1030 | if (!req_pkt) { | 1030 | if (!req_pkt) { |
| 1031 | dbg("%s: NULL req_pkt\n", __func__); | 1031 | dbg("%s: NULL req_pkt", __func__); |
| 1032 | return; | 1032 | return; |
| 1033 | } | 1033 | } |
| 1034 | if ((req_pkt->bRequestType == 0xA1) && | 1034 | if ((req_pkt->bRequestType == 0xA1) && |
| @@ -1452,7 +1452,7 @@ static int option_resume(struct usb_serial *serial) | |||
| 1452 | for (i = 0; i < serial->num_ports; i++) { | 1452 | for (i = 0; i < serial->num_ports; i++) { |
| 1453 | port = serial->port[i]; | 1453 | port = serial->port[i]; |
| 1454 | if (!port->interrupt_in_urb) { | 1454 | if (!port->interrupt_in_urb) { |
| 1455 | dbg("%s: No interrupt URB for port %d\n", __func__, i); | 1455 | dbg("%s: No interrupt URB for port %d", __func__, i); |
| 1456 | continue; | 1456 | continue; |
| 1457 | } | 1457 | } |
| 1458 | err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO); | 1458 | err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO); |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index ebd1688e62df..067e95ad2987 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
| @@ -609,7 +609,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty, | |||
| 609 | if (i < 0) | 609 | if (i < 0) |
| 610 | dev_err(&port->dev, "Set UART format %#x failed (error = %d)\n", | 610 | dev_err(&port->dev, "Set UART format %#x failed (error = %d)\n", |
| 611 | uartdata, i); | 611 | uartdata, i); |
| 612 | dbg("0x21:0x40:0:0 %d\n", i); | 612 | dbg("0x21:0x40:0:0 %d", i); |
| 613 | 613 | ||
| 614 | if (cflag & CRTSCTS) { | 614 | if (cflag & CRTSCTS) { |
| 615 | /* enable hardware flow control */ | 615 | /* enable hardware flow control */ |
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 178e4d9abb27..4f7945e672cc 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
| @@ -368,7 +368,7 @@ static int visor_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
| 368 | spin_lock_irqsave(&priv->lock, flags); | 368 | spin_lock_irqsave(&priv->lock, flags); |
| 369 | if (priv->outstanding_urbs > URB_UPPER_LIMIT) { | 369 | if (priv->outstanding_urbs > URB_UPPER_LIMIT) { |
| 370 | spin_unlock_irqrestore(&priv->lock, flags); | 370 | spin_unlock_irqrestore(&priv->lock, flags); |
| 371 | dbg("%s - write limit hit\n", __func__); | 371 | dbg("%s - write limit hit", __func__); |
| 372 | return 0; | 372 | return 0; |
| 373 | } | 373 | } |
| 374 | priv->outstanding_urbs++; | 374 | priv->outstanding_urbs++; |
| @@ -446,7 +446,7 @@ static int visor_write_room(struct tty_struct *tty) | |||
| 446 | spin_lock_irqsave(&priv->lock, flags); | 446 | spin_lock_irqsave(&priv->lock, flags); |
| 447 | if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) { | 447 | if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) { |
| 448 | spin_unlock_irqrestore(&priv->lock, flags); | 448 | spin_unlock_irqrestore(&priv->lock, flags); |
| 449 | dbg("%s - write limit hit\n", __func__); | 449 | dbg("%s - write limit hit", __func__); |
| 450 | return 0; | 450 | return 0; |
| 451 | } | 451 | } |
| 452 | spin_unlock_irqrestore(&priv->lock, flags); | 452 | spin_unlock_irqrestore(&priv->lock, flags); |
