Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Johan Hovold and committed by
Greg Kroah-Hartman
22a416c4 f1475a00

+18 -19
+1 -1
drivers/usb/serial/cypress_m8.c
··· 800 800 cypress_write_int_callback, port, priv->write_urb_interval); 801 801 result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC); 802 802 if (result) { 803 - dev_err(&port->dev, 803 + dev_err_console(port, 804 804 "%s - failed submitting write urb, error %d\n", 805 805 __func__, result); 806 806 priv->write_urb_in_use = 0;
+2 -2
drivers/usb/serial/digi_acceleport.c
··· 995 995 /* return length of new data written, or error */ 996 996 spin_unlock_irqrestore(&priv->dp_port_lock, flags); 997 997 if (ret < 0) 998 - dev_err(&port->dev, 998 + dev_err_console(port, 999 999 "%s: usb_submit_urb failed, ret=%d, port=%d\n", 1000 1000 __func__, ret, priv->dp_port_num); 1001 1001 dbg("digi_write: returning %d", ret); ··· 1065 1065 1066 1066 spin_unlock(&priv->dp_port_lock); 1067 1067 if (ret && ret != -EPERM) 1068 - dev_err(&port->dev, 1068 + dev_err_console(port, 1069 1069 "%s: usb_submit_urb failed, ret=%d, port=%d\n", 1070 1070 __func__, ret, priv->dp_port_num); 1071 1071 }
+2 -2
drivers/usb/serial/io_edgeport.c
··· 1286 1286 count = fifo->count; 1287 1287 buffer = kmalloc(count+2, GFP_ATOMIC); 1288 1288 if (buffer == NULL) { 1289 - dev_err(&edge_port->port->dev, 1289 + dev_err_console(edge_port->port, 1290 1290 "%s - no more kernel memory...\n", __func__); 1291 1291 edge_port->write_in_progress = false; 1292 1292 goto exit_send; ··· 1331 1331 status = usb_submit_urb(urb, GFP_ATOMIC); 1332 1332 if (status) { 1333 1333 /* something went wrong */ 1334 - dev_err(&edge_port->port->dev, 1334 + dev_err_console(edge_port->port, 1335 1335 "%s - usb_submit_urb(write bulk) failed, status = %d, data lost\n", 1336 1336 __func__, status); 1337 1337 edge_port->write_in_progress = false;
+2 -2
drivers/usb/serial/io_ti.c
··· 1817 1817 __func__, status); 1818 1818 return; 1819 1819 default: 1820 - dev_err(&urb->dev->dev, "%s - nonzero write bulk status " 1820 + dev_err_console(port, "%s - nonzero write bulk status " 1821 1821 "received: %d\n", __func__, status); 1822 1822 } 1823 1823 ··· 2111 2111 /* send the data out the bulk port */ 2112 2112 result = usb_submit_urb(port->write_urb, GFP_ATOMIC); 2113 2113 if (result) { 2114 - dev_err(&port->dev, 2114 + dev_err_console(port, 2115 2115 "%s - failed submitting write urb, error %d\n", 2116 2116 __func__, result); 2117 2117 edge_port->ep_write_urb_in_use = 0;
+2 -2
drivers/usb/serial/mos7720.c
··· 1294 1294 urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, 1295 1295 GFP_KERNEL); 1296 1296 if (urb->transfer_buffer == NULL) { 1297 - dev_err(&port->dev, "%s no more kernel memory...\n", 1297 + dev_err_console(port, "%s no more kernel memory...\n", 1298 1298 __func__); 1299 1299 goto exit; 1300 1300 } ··· 1315 1315 /* send it down the pipe */ 1316 1316 status = usb_submit_urb(urb, GFP_ATOMIC); 1317 1317 if (status) { 1318 - dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed " 1318 + dev_err_console(port, "%s - usb_submit_urb(write bulk) failed " 1319 1319 "with status = %d\n", __func__, status); 1320 1320 bytes_sent = status; 1321 1321 goto exit;
+2 -2
drivers/usb/serial/mos7840.c
··· 1509 1509 kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL); 1510 1510 1511 1511 if (urb->transfer_buffer == NULL) { 1512 - dev_err(&port->dev, "%s no more kernel memory...\n", 1512 + dev_err_console(port, "%s no more kernel memory...\n", 1513 1513 __func__); 1514 1514 goto exit; 1515 1515 } ··· 1535 1535 1536 1536 if (status) { 1537 1537 mos7840_port->busy[i] = 0; 1538 - dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed " 1538 + dev_err_console(port, "%s - usb_submit_urb(write bulk) failed " 1539 1539 "with status = %d\n", __func__, status); 1540 1540 bytes_sent = status; 1541 1541 goto exit;
+1 -1
drivers/usb/serial/omninet.c
··· 254 254 result = usb_submit_urb(wport->write_urb, GFP_ATOMIC); 255 255 if (result) { 256 256 set_bit(0, &wport->write_urbs_free); 257 - dev_err(&port->dev, 257 + dev_err_console(port, 258 258 "%s - failed submitting write urb, error %d\n", 259 259 __func__, result); 260 260 } else
+3 -3
drivers/usb/serial/oti6858.c
··· 302 302 if (count != 0) { 303 303 allow = kmalloc(1, GFP_KERNEL); 304 304 if (!allow) { 305 - dev_err(&port->dev, "%s(): kmalloc failed\n", 305 + dev_err_console(port, "%s(): kmalloc failed\n", 306 306 __func__); 307 307 return; 308 308 } ··· 334 334 port->write_urb->transfer_buffer_length = count; 335 335 result = usb_submit_urb(port->write_urb, GFP_NOIO); 336 336 if (result != 0) { 337 - dev_err(&port->dev, "%s(): usb_submit_urb() failed" 337 + dev_err_console(port, "%s(): usb_submit_urb() failed" 338 338 " with error %d\n", __func__, result); 339 339 priv->flags.write_urb_in_use = 0; 340 340 } ··· 938 938 port->write_urb->transfer_buffer_length = 1; 939 939 result = usb_submit_urb(port->write_urb, GFP_ATOMIC); 940 940 if (result) { 941 - dev_err(&port->dev, "%s(): usb_submit_urb() failed," 941 + dev_err_console(port, "%s(): usb_submit_urb() failed," 942 942 " error %d\n", __func__, result); 943 943 } else { 944 944 return;
+2 -3
drivers/usb/serial/ti_usb_3410_5052.c
··· 1248 1248 { 1249 1249 struct ti_port *tport = urb->context; 1250 1250 struct usb_serial_port *port = tport->tp_port; 1251 - struct device *dev = &urb->dev->dev; 1252 1251 int status = urb->status; 1253 1252 1254 1253 dbg("%s - port %d", __func__, port->number); ··· 1265 1266 wake_up_interruptible(&tport->tp_write_wait); 1266 1267 return; 1267 1268 default: 1268 - dev_err(dev, "%s - nonzero urb status, %d\n", 1269 + dev_err_console(port, "%s - nonzero urb status, %d\n", 1269 1270 __func__, status); 1270 1271 tport->tp_tdev->td_urb_error = 1; 1271 1272 wake_up_interruptible(&tport->tp_write_wait); ··· 1334 1335 1335 1336 result = usb_submit_urb(port->write_urb, GFP_ATOMIC); 1336 1337 if (result) { 1337 - dev_err(&port->dev, "%s - submit write urb failed, %d\n", 1338 + dev_err_console(port, "%s - submit write urb failed, %d\n", 1338 1339 __func__, result); 1339 1340 tport->tp_write_urb_in_use = 0; 1340 1341 /* TODO: reschedule ti_send */
+1 -1
drivers/usb/serial/whiteheat.c
··· 740 740 urb->transfer_buffer_length = bytes; 741 741 result = usb_submit_urb(urb, GFP_ATOMIC); 742 742 if (result) { 743 - dev_err(&port->dev, 743 + dev_err_console(port, 744 744 "%s - failed submitting write urb, error %d\n", 745 745 __func__, result); 746 746 sent = result;