Skip to content

Commit

Permalink
USB: mxu11x0: drop redundant function name from error messages
Browse files Browse the repository at this point in the history
Drop redundant function name from a few error messages.
Drop redundant error message when generic open fails.

Signed-off-by: Johan Hovold <johan@kernel.org>
  • Loading branch information
Johan Hovold committed Dec 29, 2015
1 parent 3645ea8 commit 6ff9d27
Showing 1 changed file with 12 additions and 20 deletions.
32 changes: 12 additions & 20 deletions drivers/usb/serial/mxu11x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -776,33 +776,31 @@ static int mxu1_open(struct tty_struct *tty, struct usb_serial_port *port)
status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT,
open_settings, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot send open command: %d\n",
__func__, status);
dev_err(&port->dev, "cannot send open command: %d\n", status);
goto unlink_int_urb;
}

status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT,
0, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot send start command: %d\n",
__func__, status);
dev_err(&port->dev, "cannot send start command: %d\n", status);
goto unlink_int_urb;
}

status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT,
MXU1_PURGE_INPUT, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot clear input buffers: %d\n",
__func__, status);
dev_err(&port->dev, "cannot clear input buffers: %d\n",
status);

goto unlink_int_urb;
}

status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT,
MXU1_PURGE_OUTPUT, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot clear output buffers: %d\n",
__func__, status);
dev_err(&port->dev, "cannot clear output buffers: %d\n",
status);

goto unlink_int_urb;
}
Expand All @@ -820,25 +818,20 @@ static int mxu1_open(struct tty_struct *tty, struct usb_serial_port *port)
status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT,
open_settings, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot send open command: %d\n",
__func__, status);
dev_err(&port->dev, "cannot send open command: %d\n", status);
goto unlink_int_urb;
}

status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT,
0, MXU1_UART1_PORT);
if (status) {
dev_err(&port->dev, "%s - cannot send start command: %d\n",
__func__, status);
dev_err(&port->dev, "cannot send start command: %d\n", status);
goto unlink_int_urb;
}

status = usb_serial_generic_open(tty, port);
if (status) {
dev_err(&port->dev, "%s - submit read urb failed: %d\n",
__func__, status);
if (status)
goto unlink_int_urb;
}

return 0;

Expand Down Expand Up @@ -921,8 +914,7 @@ static void mxu1_interrupt_callback(struct urb *urb)
}

if (data[0] == MXU1_CODE_HARDWARE_ERROR) {
dev_err(&port->dev, "%s - hardware error: %d\n",
__func__, data[1]);
dev_err(&port->dev, "hardware error: %d\n", data[1]);
goto exit;
}

Expand All @@ -943,8 +935,8 @@ static void mxu1_interrupt_callback(struct urb *urb)
break;

default:
dev_err(&port->dev, "%s - unknown interrupt code: 0x%02X\n",
__func__, data[1]);
dev_err(&port->dev, "unknown interrupt code: 0x%02X\n",
data[1]);
break;
}

Expand Down

0 comments on commit 6ff9d27

Please sign in to comment.