Commit c009ab50 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: serial drivers: fixed __FUNCTION__ usages that I missed before.

parent 9071ba1b
...@@ -462,7 +462,7 @@ static void ftdi_sio_write_bulk_callback (struct urb *urb) ...@@ -462,7 +462,7 @@ static void ftdi_sio_write_bulk_callback (struct urb *urb)
struct usb_serial_port *port = (struct usb_serial_port *)urb->context; struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct usb_serial *serial; struct usb_serial *serial;
dbg(__FUNCTION__); dbg("%s", __FUNCTION__);
if (port_paranoia_check (port, "ftdi_sio_write_bulk_callback")) { if (port_paranoia_check (port, "ftdi_sio_write_bulk_callback")) {
return; return;
...@@ -634,8 +634,8 @@ static __u16 translate_baudrate_to_ftdi(unsigned int cflag, enum ftdi_type ftdi_ ...@@ -634,8 +634,8 @@ static __u16 translate_baudrate_to_ftdi(unsigned int cflag, enum ftdi_type ftdi_
case B38400: urb_value = ftdi_sio_b38400; dbg("Set to 38400") ; break; case B38400: urb_value = ftdi_sio_b38400; dbg("Set to 38400") ; break;
case B57600: urb_value = ftdi_sio_b57600; dbg("Set to 57600") ; break; case B57600: urb_value = ftdi_sio_b57600; dbg("Set to 57600") ; break;
case B115200: urb_value = ftdi_sio_b115200; dbg("Set to 115200") ; break; case B115200: urb_value = ftdi_sio_b115200; dbg("Set to 115200") ; break;
default: dbg(__FUNCTION__ " FTDI_SIO does not support the baudrate (%d) requested", default: dbg("%s - FTDI_SIO does not support the baudrate (%d) requested",
(cflag & CBAUD)); __FUNCTION__, (cflag & CBAUD));
break; break;
} }
} else { /* it is 8U232AM */ } else { /* it is 8U232AM */
...@@ -654,8 +654,8 @@ static __u16 translate_baudrate_to_ftdi(unsigned int cflag, enum ftdi_type ftdi_ ...@@ -654,8 +654,8 @@ static __u16 translate_baudrate_to_ftdi(unsigned int cflag, enum ftdi_type ftdi_
case B230400: urb_value = ftdi_8U232AM_48MHz_b230400; dbg("Set to 230400") ; break; case B230400: urb_value = ftdi_8U232AM_48MHz_b230400; dbg("Set to 230400") ; break;
case B460800: urb_value = ftdi_8U232AM_48MHz_b460800; dbg("Set to 460800") ; break; case B460800: urb_value = ftdi_8U232AM_48MHz_b460800; dbg("Set to 460800") ; break;
case B921600: urb_value = ftdi_8U232AM_48MHz_b921600; dbg("Set to 921600") ; break; case B921600: urb_value = ftdi_8U232AM_48MHz_b921600; dbg("Set to 921600") ; break;
default: dbg(__FUNCTION__ " The baudrate (%d) requested is not implemented", default: dbg("%s - The baudrate (%d) requested is not implemented",
(cflag & CBAUD)); __FUNCTION__, (cflag & CBAUD));
break; break;
} }
} }
...@@ -685,10 +685,11 @@ static void ftdi_sio_break_ctl( struct usb_serial_port *port, int break_state ) ...@@ -685,10 +685,11 @@ static void ftdi_sio_break_ctl( struct usb_serial_port *port, int break_state )
FTDI_SIO_SET_DATA_REQUEST_TYPE, FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , 0, urb_value , 0,
buf, 0, WDR_TIMEOUT) < 0) { buf, 0, WDR_TIMEOUT) < 0) {
err(__FUNCTION__ " FAILED to enable/disable break state (state was %d)",break_state); err("%s - FAILED to enable/disable break state (state was %d)",
__FUNCTION__, break_state);
} }
dbg(__FUNCTION__ " break state is %d - urb is %d",break_state, urb_value); dbg("%s - break state is %d - urb is %d", __FUNCTION__, break_state, urb_value);
} }
...@@ -778,7 +779,7 @@ static void ftdi_sio_set_termios (struct usb_serial_port *port, struct termios * ...@@ -778,7 +779,7 @@ static void ftdi_sio_set_termios (struct usb_serial_port *port, struct termios *
FTDI_SIO_SET_BAUDRATE_REQUEST_TYPE, FTDI_SIO_SET_BAUDRATE_REQUEST_TYPE,
urb_value, 0, urb_value, 0,
buf, 0, 100) < 0) { buf, 0, 100) < 0) {
err(__FUNCTION__ " urb failed to set baurdrate"); err("%s urb failed to set baurdrate", __FUNCTION__);
} }
} }
/* Set flow control */ /* Set flow control */
......
...@@ -580,7 +580,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp) ...@@ -580,7 +580,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
static void __serial_close(struct usb_serial_port *port, struct file *filp) static void __serial_close(struct usb_serial_port *port, struct file *filp)
{ {
if (!port->open_count) { if (!port->open_count) {
dbg (__FUNCTION__ " - port not opened"); dbg ("%s - port not opened", __FUNCTION__);
return; return;
} }
...@@ -719,7 +719,7 @@ static void serial_throttle (struct tty_struct * tty) ...@@ -719,7 +719,7 @@ static void serial_throttle (struct tty_struct * tty)
dbg("%s - port %d", __FUNCTION__, port->number); dbg("%s - port %d", __FUNCTION__, port->number);
if (!port->open_count) { if (!port->open_count) {
dbg (__FUNCTION__ " - port not open"); dbg ("%s - port not open", __FUNCTION__);
goto exit; goto exit;
} }
......
...@@ -394,7 +394,8 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig ...@@ -394,7 +394,8 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig
/* send it down the pipe */ /* send it down the pipe */
status = usb_submit_urb(urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) { if (status) {
err(__FUNCTION__ " - usb_submit_urb(write bulk) failed with status = %d", status); err("%s - usb_submit_urb(write bulk) failed with status = %d",
__FUNCTION__, status);
count = status; count = status;
} else { } else {
bytes_out += count; bytes_out += count;
...@@ -742,16 +743,17 @@ static void visor_set_termios (struct usb_serial_port *port, struct termios *old ...@@ -742,16 +743,17 @@ static void visor_set_termios (struct usb_serial_port *port, struct termios *old
if (cflag & CRTSCTS) if (cflag & CRTSCTS)
dbg("%s - RTS/CTS is enabled", __FUNCTION__); dbg("%s - RTS/CTS is enabled", __FUNCTION__);
else else
dbg(__FUNCTION__ " - RTS/CTS is disabled"); dbg("%s - RTS/CTS is disabled", __FUNCTION__);
/* determine software flow control */ /* determine software flow control */
if (I_IXOFF(port->tty)) if (I_IXOFF(port->tty))
dbg(__FUNCTION__ " - XON/XOFF is enabled, XON = %2x, XOFF = %2x", START_CHAR(port->tty), STOP_CHAR(port->tty)); dbg("%s - XON/XOFF is enabled, XON = %2x, XOFF = %2x",
__FUNCTION__, START_CHAR(port->tty), STOP_CHAR(port->tty));
else else
dbg(__FUNCTION__ " - XON/XOFF is disabled"); dbg("%s - XON/XOFF is disabled", __FUNCTION__);
/* get the baud rate wanted */ /* get the baud rate wanted */
dbg(__FUNCTION__ " - baud rate = %d", tty_get_baud_rate(port->tty)); dbg("%s - baud rate = %d", __FUNCTION__, tty_get_baud_rate(port->tty));
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment