USB: serial: use dev_err_console in custom write paths

Use dev_err_console in write paths for devices which can be used as a
console but do not use the generic write implementation.

Compile-only tested.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

10 files changed, 18 insertions, 19 deletions

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 3bdeafa29c24..5ae86b349cad 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -800,7 +800,7 @@ send:
                 cypress_write_int_callback, port, priv->write_urb_interval);
         result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
         if (result) {
-                dev_err(&port->dev,
+                dev_err_console(port,
                                 "%s - failed submitting write urb, error %d\n",
                                                         __func__, result);
                 priv->write_urb_in_use = 0;
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index b23bebd721a1..2b1da0cc071a 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -995,7 +995,7 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
         /* return length of new data written, or error */
         spin_unlock_irqrestore(&priv->dp_port_lock, flags);
         if (ret < 0)
-                dev_err(&port->dev,
+                dev_err_console(port,
                         "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                         __func__, ret, priv->dp_port_num);
         dbg("digi_write: returning %d", ret);
@@ -1065,7 +1065,7 @@ static void digi_write_bulk_callback(struct urb *urb)
 
         spin_unlock(&priv->dp_port_lock);
         if (ret && ret != -EPERM)
-                dev_err(&port->dev,
+                dev_err_console(port,
                         "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                         __func__, ret, priv->dp_port_num);
 }
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 0497575e4799..616b07862771 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1286,7 +1286,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         count = fifo->count;
         buffer = kmalloc(count+2, GFP_ATOMIC);
         if (buffer == NULL) {
-                dev_err(&edge_port->port->dev,
+                dev_err_console(edge_port->port,
                                 "%s - no more kernel memory...\n", __func__);
                 edge_port->write_in_progress = false;
                 goto exit_send;
@@ -1331,7 +1331,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
                 /* something went wrong */
-                dev_err(&edge_port->port->dev,
+                dev_err_console(edge_port->port,
                         "%s - usb_submit_urb(write bulk) failed, status = %d, data lost\n",
                                 __func__, status);
                 edge_port->write_in_progress = false;
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 65bf06aa591a..311e4bf46dee 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1817,7 +1817,7 @@ static void edge_bulk_out_callback(struct urb *urb)
                     __func__, status);
                 return;
         default:
-                dev_err(&urb->dev->dev, "%s - nonzero write bulk status "
+                dev_err_console(port, "%s - nonzero write bulk status "
                         "received: %d\n", __func__, status);
         }
 
@@ -2111,7 +2111,7 @@ static void edge_send(struct tty_struct *tty)
         /* send the data out the bulk port */
         result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
         if (result) {
-                dev_err(&port->dev,
+                dev_err_console(port,
                         "%s - failed submitting write urb, error %d\n",
                                 __func__, result);
                 edge_port->ep_write_urb_in_use = 0;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 4554ee49e635..4fb29b4aaad6 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1294,7 +1294,7 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
                 urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
                                                GFP_KERNEL);
                 if (urb->transfer_buffer == NULL) {
-                        dev_err(&port->dev, "%s no more kernel memory...\n",
+                        dev_err_console(port, "%s no more kernel memory...\n",
                                 __func__);
                         goto exit;
                 }
@@ -1315,7 +1315,7 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
         /* send it down the pipe */
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
-                dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
+                dev_err_console(port, "%s - usb_submit_urb(write bulk) failed "
                         "with status = %d\n", __func__, status);
                 bytes_sent = status;
                 goto exit;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 03b5e249e95e..19b11cece6ba 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1509,7 +1509,7 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
                     kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
 
                 if (urb->transfer_buffer == NULL) {
-                        dev_err(&port->dev, "%s no more kernel memory...\n",
+                        dev_err_console(port, "%s no more kernel memory...\n",
                                 __func__);
                         goto exit;
                 }
@@ -1535,7 +1535,7 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
 
         if (status) {
                 mos7840_port->busy[i] = 0;
-                dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
+                dev_err_console(port, "%s - usb_submit_urb(write bulk) failed "
                         "with status = %d\n", __func__, status);
                 bytes_sent = status;
                 goto exit;
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 8b8d58a2ac12..033e8afa6c77 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -254,7 +254,7 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
         result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
         if (result) {
                 set_bit(0, &wport->write_urbs_free);
-                dev_err(&port->dev,
+                dev_err_console(port,
                         "%s - failed submitting write urb, error %d\n",
                         __func__, result);
         } else
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index e287fd32682c..343e626a06f8 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -302,7 +302,7 @@ static void send_data(struct work_struct *work)
         if (count != 0) {
                 allow = kmalloc(1, GFP_KERNEL);
                 if (!allow) {
-                        dev_err(&port->dev, "%s(): kmalloc failed\n",
+                        dev_err_console(port, "%s(): kmalloc failed\n",
                                         __func__);
                         return;
                 }
@@ -334,7 +334,7 @@ static void send_data(struct work_struct *work)
         port->write_urb->transfer_buffer_length = count;
         result = usb_submit_urb(port->write_urb, GFP_NOIO);
         if (result != 0) {
-                dev_err(&port->dev, "%s(): usb_submit_urb() failed"
+                dev_err_console(port, "%s(): usb_submit_urb() failed"
                                " with error %d\n", __func__, result);
                 priv->flags.write_urb_in_use = 0;
         }
@@ -938,7 +938,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
                 port->write_urb->transfer_buffer_length = 1;
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
-                        dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
+                        dev_err_console(port, "%s(): usb_submit_urb() failed,"
                                         " error %d\n", __func__, result);
                 } else {
                         return;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 8468eb769a29..91d0dc640360 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1248,7 +1248,6 @@ static void ti_bulk_out_callback(struct urb *urb)
 {
         struct ti_port *tport = urb->context;
         struct usb_serial_port *port = tport->tp_port;
-        struct device *dev = &urb->dev->dev;
         int status = urb->status;
 
         dbg("%s - port %d", __func__, port->number);
@@ -1266,7 +1265,7 @@ static void ti_bulk_out_callback(struct urb *urb)
                 wake_up_interruptible(&tport->tp_write_wait);
                 return;
         default:
-                dev_err(dev, "%s - nonzero urb status, %d\n",
+                dev_err_console(port, "%s - nonzero urb status, %d\n",
                         __func__, status);
                 tport->tp_tdev->td_urb_error = 1;
                 wake_up_interruptible(&tport->tp_write_wait);
@@ -1335,7 +1334,7 @@ static void ti_send(struct ti_port *tport)
 
         result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
         if (result) {
-                dev_err(&port->dev, "%s - submit write urb failed, %d\n",
+                dev_err_console(port, "%s - submit write urb failed, %d\n",
                                                         __func__, result);
                 tport->tp_write_urb_in_use = 0;
                 /* TODO: reschedule ti_send */
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 7e0acf5c8e38..007cf3a2481a 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -740,7 +740,7 @@ static int whiteheat_write(struct tty_struct *tty,
                 urb->transfer_buffer_length = bytes;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result) {
-                        dev_err(&port->dev,
+                        dev_err_console(port,
                                 "%s - failed submitting write urb, error %d\n",
                                 __func__, result);
                         sent = result;