Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a416c4 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1475a00

drivers/usb/serial/cypress_m8.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static void cypress_send(struct usb_serial_port *port) 
		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;

drivers/usb/serial/digi_acceleport.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/usb/serial/io_edgeport.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/serial/io_ti.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/serial/mos7720.c

+2 −2
Original line number Diff line number Diff line
@@ -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;