USB: serial: Remove unnecessary \n's from dbg uses

#define dbg adds the newline, messages shouldn't.
Converted dbg("%s", "some string") to dbg("some string")

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 61e15ef071664d301311e705ca83dcdc05823004..e2600e7ce4eaf6a3baed2a53d0629e6e489cfd04 100644 (file)
--- 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,
                                baud);
                if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
                                        ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
-                       dbg("Baud rate requested not supported by device\n");
+                       dbg("Baud rate requested not supported by device");
                        baud = tty_termios_baud_rate(old_termios);
                }
        }

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 23c8bd6dedeb8847fcc9f4a8d5793bf3d1d02790..036f9996fe52db05cd433e9188fa72f932a5971a 100644 (file)
--- 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)
 
        tty = tty_port_tty_get(&port->port);
        if (!tty) {
-               dbg("%s - ignoring since device not open\n", __func__);
+               dbg("%s - ignoring since device not open", __func__);
                return;
        }
        if (urb->actual_length) {

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index d59262ecc22906be90aec77bf3f262f17e9d8c60..1c84355a0c802b249f550931ce0d6c6fe73fc416 100644 (file)
--- 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,
        spin_lock_irqsave(&priv->tx_lock, flags);
        if (priv->tx_outstanding_urbs > URB_UPPER_LIMIT) {
                spin_unlock_irqrestore(&priv->tx_lock, flags);
-               dbg("%s - write limit hit\n", __func__);
+               dbg("%s - write limit hit", __func__);
                return 0;
        }
        priv->tx_outstanding_urbs++;

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 0b1c4732b87801afb21b63a0331318591ea58420..5288203d883f164e6eb7bad23de10fa76fbe2ab7 100644 (file)
--- 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,
                if (port->urbs_in_flight >
                    port->serial->type->max_in_flight_urbs) {
                        spin_unlock_irqrestore(&port->lock, flags);
-                       dbg("%s - write limit hit\n", __func__);
+                       dbg("%s - write limit hit", __func__);
                        return bwrite;
                }
                port->tx_bytes_flight += towrite;

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index c055c8ba377daa22fe120395e405859d7f91c504..66fb58f427cd39b476288a4144f911cf0e697c8f 100644 (file)
--- 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,
                        return;
 
                case IOSP_EXT_STATUS_RX_CHECK_RSP:
-                       dbg("%s ========== Port %u CHECK_RSP Sequence = %02x =============\n", __func__, edge_serial->rxPort, byte3);
+                       dbg("%s ========== Port %u CHECK_RSP Sequence = %02x =============", __func__, edge_serial->rxPort, byte3);
                        /* Port->RxCheckRsp = true; */
                        return;
                }
@@ -2039,7 +2039,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
                break;
 
        default:
-               dbg("%s - Unrecognized IOSP status code %u\n", __func__, code);
+               dbg("%s - Unrecognized IOSP status code %u", __func__, code);
                break;
        }
        return;
@@ -2494,7 +2494,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor)
 
                *divisor = custom;
 
-               dbg("%s - Baud %d = %d\n", __func__, baudrate, custom);
+               dbg("%s - Baud %d = %d", __func__, baudrate, custom);
                return 0;
        }
 
@@ -2879,7 +2879,7 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
                        break;
 
                case EDGE_DOWNLOAD_FILE_NONE:
-                       dbg     ("No download file specified, skipping download\n");
+                       dbg("No download file specified, skipping download");
                        return;
 
                default:

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 8f0aa64940a6a81a4c4c2dd94e23734264cba0f8..98e50456ad79d0a0a9d1943bef67870924820298 100644 (file)
--- 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)
        case TIUMP_INTERRUPT_CODE_MSR:  /* MSR */
                /* Copy MSR from UMP */
                msr = data[1];
-               dbg("%s - ===== Port %u MSR Status = %02x ======\n",
+               dbg("%s - ===== Port %u MSR Status = %02x ======",
                     __func__, port_number, msr);
                handle_new_msr(edge_port, msr);
                break;

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index e0aa031c54186f07d71830eb372bc2052ba87c14..546b29f73c2cfbed9ec536b1b9c13b2e27fd2d0b 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -109,7 +109,7 @@ static void mos7720_interrupt_callback(struct urb *urb)
        __u8 sp1;
        __u8 sp2;
 
-       dbg("%s", " : Entering\n");
+       dbg(" : Entering");
 
        switch (status) {
        case 0:
@@ -278,7 +278,7 @@ static void mos7720_bulk_in_callback(struct urb *urb)
 
        mos7720_port = urb->context;
        if (!mos7720_port) {
-               dbg("%s", "NULL mos7720_port pointer \n");
+               dbg("NULL mos7720_port pointer");
                return ;
        }
 
@@ -386,7 +386,7 @@ static int send_mos_cmd(struct usb_serial *serial, __u8 request, __u16 value,
        }
 out:
        if (status < 0)
-               dbg("Command Write failed Value %x index %x\n", value, index);
+               dbg("Command Write failed Value %x index %x", value, index);
 
        return status;
 }
@@ -491,7 +491,7 @@ static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port)
          */
        port_number = port->number - port->serial->minor;
        send_mos_cmd(port->serial, MOS_READ, port_number, UART_LSR, &data);
-       dbg("SS::%p LSR:%x\n", mos7720_port, data);
+       dbg("SS::%p LSR:%x", mos7720_port, data);
 
        dbg("Check:Sending Command ..........");
 
@@ -830,7 +830,7 @@ static void mos7720_throttle(struct tty_struct *tty)
        struct moschip_port *mos7720_port;
        int status;
 
-       dbg("%s- port %d\n", __func__, port->number);
+       dbg("%s- port %d", __func__, port->number);
 
        mos7720_port = usb_get_serial_port_data(port);
 
@@ -1309,7 +1309,7 @@ static void mos7720_set_termios(struct tty_struct *tty,
                return;
        }
 
-       dbg("%s\n", "setting termios - ASPIRE");
+       dbg("setting termios - ASPIRE");
 
        cflag = tty->termios->c_cflag;
 
@@ -1327,7 +1327,7 @@ static void mos7720_set_termios(struct tty_struct *tty,
        change_port_settings(tty, mos7720_port, old_termios);
 
        if (!port->read_urb) {
-               dbg("%s", "URB KILLED !!!!!\n");
+               dbg("URB KILLED !!!!!");
                return;
        }
 

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 38762a0fb5bf21f2e031336323e7a912d81ee8d8..7793c4ada038fe32e4dffa5d47e67c89fda26168 100644 (file)
--- 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)
        struct usb_serial_port  *port   =  urb->context;
        int status = urb->status;
 
-       dbg("%s - port %0x\n", __func__, port->number);
+       dbg("%s - port %0x", __func__, port->number);
 
        port->write_urb_busy = 0;
        if (status) {

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index a654317e7d15e7f3900e9c1f5411594104070cc4..773286672ec9c84c25d43b12d31dd19b255bedb0 100644 (file)
--- 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,
        spin_lock_irqsave(&priv->lock, flags);
        if (priv->outstanding_urbs > URB_UPPER_LIMIT) {
                spin_unlock_irqrestore(&priv->lock, flags);
-               dbg("%s - write limit hit\n", __func__);
+               dbg("%s - write limit hit", __func__);
                return 0;
        }
        priv->outstanding_urbs++;
@@ -288,7 +288,7 @@ static int opticon_write_room(struct tty_struct *tty)
        spin_lock_irqsave(&priv->lock, flags);
        if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) {
                spin_unlock_irqrestore(&priv->lock, flags);
-               dbg("%s - write limit hit\n", __func__);
+               dbg("%s - write limit hit", __func__);
                return 0;
        }
        spin_unlock_irqrestore(&priv->lock, flags);

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 51b0beb39280bb44adc62d710ee1376426319ba4..f6646b30f9540b15107ced413b15244bca4f9b4a 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1028,7 +1028,7 @@ static void option_instat_callback(struct urb *urb)
                                (struct usb_ctrlrequest *)urb->transfer_buffer;
 
                if (!req_pkt) {
-                       dbg("%s: NULL req_pkt\n", __func__);
+                       dbg("%s: NULL req_pkt", __func__);
                        return;
                }
                if ((req_pkt->bRequestType == 0xA1) &&
@@ -1452,7 +1452,7 @@ static int option_resume(struct usb_serial *serial)
        for (i = 0; i < serial->num_ports; i++) {
                port = serial->port[i];
                if (!port->interrupt_in_urb) {
-                       dbg("%s: No interrupt URB for port %d\n", __func__, i);
+                       dbg("%s: No interrupt URB for port %d", __func__, i);
                        continue;
                }
                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 ebd1688e62dfa1b6da188f9c0fe300a1f3b361a8..067e95ad2987270f678030127db359d9ae784af5 100644 (file)
--- 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,
        if (i < 0)
                dev_err(&port->dev, "Set UART format %#x failed (error = %d)\n",
                        uartdata, i);
-       dbg("0x21:0x40:0:0  %d\n", i);
+       dbg("0x21:0x40:0:0  %d", i);
 
        if (cflag & CRTSCTS) {
                /* enable hardware flow control */

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 178e4d9abb273841d29b46cf7bedca2180def507..4f7945e672cc4ca4498d6fceca474968d8df62df 100644 (file)
--- 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,
        spin_lock_irqsave(&priv->lock, flags);
        if (priv->outstanding_urbs > URB_UPPER_LIMIT) {
                spin_unlock_irqrestore(&priv->lock, flags);
-               dbg("%s - write limit hit\n", __func__);
+               dbg("%s - write limit hit", __func__);
                return 0;
        }
        priv->outstanding_urbs++;
@@ -446,7 +446,7 @@ static int visor_write_room(struct tty_struct *tty)
        spin_lock_irqsave(&priv->lock, flags);
        if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) {
                spin_unlock_irqrestore(&priv->lock, flags);
-               dbg("%s - write limit hit\n", __func__);
+               dbg("%s - write limit hit", __func__);
                return 0;
        }
        spin_unlock_irqrestore(&priv->lock, flags);