USB: serial: add missing newlines to dev_<level> messages.

Add missing newlines to dev_<level> messages.

Also make some messages less verbose where appropriate.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 82371f61f23d5b3d95a047314dc9953ca3721ea4..2d72aa3564a31e9eeade77423ec16de3d743c706 100644 (file)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -323,11 +323,11 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
        if (r)
                goto out;
 
-       dev_dbg(&port->dev, "%s - submitting interrupt urb", __func__);
+       dev_dbg(&port->dev, "%s - submitting interrupt urb\n", __func__);
        r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
        if (r) {
-               dev_err(&port->dev, "%s - failed submitting interrupt urb,"
-                       " error %d\n", __func__, r);
+               dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n",
+                       __func__, r);
                ch341_close(port);
                goto out;
        }

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 0ac3b3b3236c5f3e6982aa07f602a3b36afc15e7..2916dea3ede84a2a02f8ed58f8b31c18f0fefc1b 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -220,7 +220,7 @@ static int cyberjack_write(struct tty_struct *tty,
                result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                if (result) {
                        dev_err(&port->dev,
-                               "%s - failed submitting write urb, error %d",
+                               "%s - failed submitting write urb, error %d\n",
                                __func__, result);
                        /* Throw away data. No better idea what to do with it. */
                        priv->wrfilled = 0;

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 634f0d6605edd34063f080fcae2ad8f7b7cafe70..01bf533928192d6f2f4b77f44995bd63fd6d1be2 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -279,7 +279,7 @@ static int analyze_baud_rate(struct usb_serial_port *port, speed_t new_rate)
                         * the generic firmware, but are not used with
                         * NMEA and SiRF protocols */
                        dev_dbg(&port->dev,
-                               "%s - failed setting baud rate, unsupported speed of %d on Earthmate GPS",
+                               "%s - failed setting baud rate, unsupported speed of %d on Earthmate GPS\n",
                                __func__, new_rate);
                        return -1;
                }

diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index d00dae17d520d8fffb744bc1c0f1d196f0344beb..5ad4a0fb4b26ff67380b00e5023ca24e77078266 100644 (file)
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1151,7 +1151,7 @@ static ssize_t vcc_mode_store(struct device *dev,
                goto fail_store_vcc_mode;
        }
 
-       dev_dbg(dev, "%s: setting vcc_mode = %ld", __func__, v);
+       dev_dbg(dev, "%s: setting vcc_mode = %ld\n", __func__, v);
 
        if ((v != 3) && (v != 5)) {
                dev_err(dev, "%s - vcc_mode %ld is invalid\n", __func__, v);

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index e972412b614b6e84082ca8afafcd9778c1ab701d..742d827f876cfe5dc10fe73783fdc5152f91ec8f 100644 (file)
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -189,7 +189,7 @@ exit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
                dev_err(&port->dev,
-                       "%s - usb_submit_urb failed with result %d",
+                       "%s - usb_submit_urb failed with result %d\n",
                        __func__, retval);
 }
 

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index c88cc4966b23f067e4b443d937f2ee5c15f5cfad..d7440b7557afde7a643dbf76f8e22eae517bf435 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -201,7 +201,7 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
        else {
                status = get_unaligned_le16(status_buf);
 
-               dev_info(&port->serial->dev->dev, "read status %x %x",
+               dev_info(&port->serial->dev->dev, "read status %x %x\n",
                         status_buf[0], status_buf[1]);
 
                *line_state_p = klsi_105_status2linestate(status);
@@ -464,7 +464,7 @@ static void klsi_105_set_termios(struct tty_struct *tty,
                priv->cfg.baudrate = kl5kusb105a_sio_b115200;
                break;
        default:
-               dev_dbg(dev, "KLSI USB->Serial converter: unsupported baudrate request, using default of 9600");
+               dev_dbg(dev, "unsupported baudrate, using 9600\n");
                priv->cfg.baudrate = kl5kusb105a_sio_b9600;
                baud = 9600;
                break;

diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 618c1c1f227e1c56783aea4f05aad0f31dde9bf1..fee242387f55cf9ea08d5eef2d1f5dff3679f6c1 100644 (file)
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -557,7 +557,8 @@ static int kobil_ioctl(struct tty_struct *tty,
                        );
 
                dev_dbg(&port->dev,
-                       "%s - Send reset_all_queues (FLUSH) URB returns: %i", __func__, result);
+                       "%s - Send reset_all_queues (FLUSH) URB returns: %i\n",
+                       __func__, result);
                kfree(transfer_buffer);
                return (result < 0) ? -EIO: 0;
        default:

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 4eb277225a771f5e0690dc91b04a84c8a7db110f..dfd728a263d29bbc522e20d52448c7da4c977fc9 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -209,7 +209,7 @@ static int write_mos_reg(struct usb_serial *serial, unsigned int serial_portnum,
                                     index, NULL, 0, MOS_WDR_TIMEOUT);
        if (status < 0)
                dev_err(&usbdev->dev,
-                       "mos7720: usb_control_msg() failed: %d", status);
+                       "mos7720: usb_control_msg() failed: %d\n", status);
        return status;
 }
 
@@ -240,7 +240,7 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum,
                *data = *buf;
        else if (status < 0)
                dev_err(&usbdev->dev,
-                       "mos7720: usb_control_msg() failed: %d", status);
+                       "mos7720: usb_control_msg() failed: %d\n", status);
        kfree(buf);
 
        return status;
@@ -399,7 +399,7 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport,
                              &mos_parport->deferred_urbs);
                spin_unlock_irqrestore(&mos_parport->listlock, flags);
                tasklet_schedule(&mos_parport->urb_tasklet);
-               dev_dbg(&usbdev->dev, "tasklet scheduled");
+               dev_dbg(&usbdev->dev, "tasklet scheduled\n");
                return 0;
        }
 
@@ -418,7 +418,7 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport,
        mutex_unlock(&serial->disc_mutex);
        if (ret_val) {
                dev_err(&usbdev->dev,
-                       "%s: submit_urb() failed: %d", __func__, ret_val);
+                       "%s: submit_urb() failed: %d\n", __func__, ret_val);
                spin_lock_irqsave(&mos_parport->listlock, flags);
                list_del(&urbtrack->urblist_entry);
                spin_unlock_irqrestore(&mos_parport->listlock, flags);
@@ -656,7 +656,7 @@ static size_t parport_mos7715_write_compat(struct parport *pp,
        parport_epilogue(pp);
        if (retval) {
                dev_err(&mos_parport->serial->dev->dev,
-                       "mos7720: usb_bulk_msg() failed: %d", retval);
+                       "mos7720: usb_bulk_msg() failed: %d\n", retval);
                return 0;
        }
        return actual_len;
@@ -875,7 +875,7 @@ static void mos7715_interrupt_callback(struct urb *urb)
        if (!(iir & 0x01)) {    /* serial port interrupt pending */
                switch (iir & 0x0f) {
                case SERIAL_IIR_RLS:
-                       dev_dbg(dev, "Serial Port: Receiver status error or address bit detected in 9-bit mode\n\n");
+                       dev_dbg(dev, "Serial Port: Receiver status error or address bit detected in 9-bit mode\n");
                        break;
                case SERIAL_IIR_CTI:
                        dev_dbg(dev, "Serial Port: Receiver time out\n");

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index e9d967ff521b5713fdd2dcc6d0d4bcddeabad061..393be562d875da89b573f124712c5959ea663247 100644 (file)
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -522,11 +522,11 @@ static void mos7840_set_led_callback(struct urb *urb)
        case -ENOENT:
        case -ESHUTDOWN:
                /* This urb is terminated, clean up */
-               dev_dbg(&urb->dev->dev, "%s - urb shutting down with status: %d",
+               dev_dbg(&urb->dev->dev, "%s - urb shutting down: %d\n",
                        __func__, urb->status);
                break;
        default:
-               dev_dbg(&urb->dev->dev, "%s - nonzero urb status received: %d",
+               dev_dbg(&urb->dev->dev, "%s - nonzero urb status: %d\n",
                        __func__, urb->status);
        }
 }

diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 7725ed261ed6abb6de36655b62e48a2c9ca345f7..504f5bff79c0c27d3171de45da2b8678fd0acc03 100644 (file)
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -372,7 +372,7 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
                                 device_port, data, 2, QT2_USB_TIMEOUT);
 
        if (status < 0) {
-               dev_err(&port->dev, "%s - open port failed %i", __func__,
+               dev_err(&port->dev, "%s - open port failed %i\n", __func__,
                        status);
                kfree(data);
                return status;

diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 4ec04f73c800f7ce8f2b64ff63c506c8ef113f51..ef0dbf0703c574eb62d1e2ce3be49e5186258aee 100644 (file)
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -220,9 +220,9 @@ static int spcp8x5_get_msr(struct usb_serial_port *port, u8 *status)
                              GET_UART_STATUS, GET_UART_STATUS_TYPE,
                              0, GET_UART_STATUS_MSR, buf, 1, 100);
        if (ret < 0)
-               dev_err(&port->dev, "failed to get modem status: %d", ret);
+               dev_err(&port->dev, "failed to get modem status: %d\n", ret);
 
-       dev_dbg(&port->dev, "0xc0:0x22:0:6  %d - 0x02%x", ret, *buf);
+       dev_dbg(&port->dev, "0xc0:0x22:0:6  %d - 0x02%x\n", ret, *buf);
        *status = *buf;
        kfree(buf);
 
@@ -342,8 +342,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        case 1000000:
                        buf[0] = 0x0b;  break;
        default:
-               dev_err(&port->dev, "spcp825 driver does not support the "
-                       "baudrate requested, using default of 9600.\n");
+               dev_err(&port->dev, "unsupported baudrate, using 9600\n");
        }
 
        /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */

diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 9fa7dd413e8361ddef978763dee1f979916063d0..8fceec7298e007919f8585a93e9298d2256e6bb7 100644 (file)
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -74,9 +74,7 @@ static void symbol_int_callback(struct urb *urb)
                tty_insert_flip_string(&port->port, &data[1], data_length);
                tty_flip_buffer_push(&port->port);
        } else {
-               dev_dbg(&port->dev,
-                       "Improper amount of data received from the device, "
-                       "%d bytes", urb->actual_length);
+               dev_dbg(&port->dev, "%s - short packet\n", __func__);
        }
 
 exit:

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index ec7cea58566327a398e29eef2883ffb1f82c4967..3dd3ff8c50d3b718775ab7d6df9796304129bf49 100644 (file)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -293,7 +293,7 @@ static int ti_startup(struct usb_serial *serial)
        int status;
 
        dev_dbg(&dev->dev,
-               "%s - product 0x%4X, num configurations %d, configuration value %d",
+               "%s - product 0x%4X, num configurations %d, configuration value %d\n",
                __func__, le16_to_cpu(dev->descriptor.idProduct),
                dev->descriptor.bNumConfigurations,
                dev->actconfig->desc.bConfigurationValue);
@@ -803,7 +803,7 @@ static void ti_set_termios(struct tty_struct *tty,
                tty_encode_baud_rate(tty, baud, baud);
 
        dev_dbg(&port->dev,
-               "%s - BaudRate=%d, wBaudRate=%d, wFlags=0x%04X, bDataBits=%d, bParity=%d, bStopBits=%d, cXon=%d, cXoff=%d, bUartMode=%d",
+               "%s - BaudRate=%d, wBaudRate=%d, wFlags=0x%04X, bDataBits=%d, bParity=%d, bStopBits=%d, cXon=%d, cXoff=%d, bUartMode=%d\n",
                __func__, baud, config->wBaudRate, config->wFlags,
                config->bDataBits, config->bParity, config->bStopBits,
                config->cXon, config->cXoff, config->bUartMode);

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 4c3aeaf56dc1134720252d4a8631d67675b82a2c..81fc0dfcfdcf6a073dc408ae7203747b1cd6167b 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -868,7 +868,7 @@ static int usb_serial_probe(struct usb_interface *interface,
        max_endpoints = max(max_endpoints, (int)serial->num_ports);
        serial->num_port_pointers = max_endpoints;
 
-       dev_dbg(ddev, "setting up %d port structures for this device", max_endpoints);
+       dev_dbg(ddev, "setting up %d port structure(s)\n", max_endpoints);
        for (i = 0; i < max_endpoints; ++i) {
                port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
                if (!port)
@@ -1033,7 +1033,7 @@ static int usb_serial_probe(struct usb_interface *interface,
        for (i = 0; i < num_ports; ++i) {
                port = serial->port[i];
                dev_set_name(&port->dev, "ttyUSB%d", port->minor);
-               dev_dbg(ddev, "registering %s", dev_name(&port->dev));
+               dev_dbg(ddev, "registering %s\n", dev_name(&port->dev));
                device_enable_async_suspend(&port->dev);
 
                retval = device_add(&port->dev);