lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: replace remaining __FUNCTION__ occurrences

Browse Source 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Harvey Harrison
2008-03-03 16:08:34 -08:00
committed by Greg Kroah-Hartman
parent 14722ef4ac
commit 441b62c1ed
83 changed files with 2130 additions and 2130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/usb/serial/safe_serial.c
View File

@ -202,11 +202,11 @@ static void safe_read_bulk_callback (struct urb *urb)
int result;
int status = urb->status;
dbg ("%s", __FUNCTION__);
dbg ("%s", __func__);
if (status) {
dbg("%s - nonzero read bulk status received: %d",
__FUNCTION__, status);
__func__, status);
return;
}
@ -232,18 +232,18 @@ static void safe_read_bulk_callback (struct urb *urb)
if (actual_length <= (length - 2)) {
info ("%s - actual: %d", __FUNCTION__, actual_length);
info ("%s - actual: %d", __func__, actual_length);
for (i = 0; i < actual_length; i++) {
tty_insert_flip_char (port->tty, data[i], 0);
}
tty_flip_buffer_push (port->tty);
} else {
err ("%s - inconsistent lengths %d:%d", __FUNCTION__,
err ("%s - inconsistent lengths %d:%d", __func__,
actual_length, length);
}
} else {
err ("%s - bad CRC %x", __FUNCTION__, fcs);
err ("%s - bad CRC %x", __func__, fcs);
}
} else {
for (i = 0; i < length; i++) {
@ -259,7 +259,7 @@ static void safe_read_bulk_callback (struct urb *urb)
safe_read_bulk_callback, port);
if ((result = usb_submit_urb (urb, GFP_ATOMIC))) {
err ("%s - failed resubmitting read urb, error %d", __FUNCTION__, result);
err ("%s - failed resubmitting read urb, error %d", __func__, result);
}
}
@ -274,7 +274,7 @@ static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
count);
if (!port->write_urb) {
dbg ("%s - write urb NULL", __FUNCTION__);
dbg ("%s - write urb NULL", __func__);
return (0);
}
@ -282,17 +282,17 @@ static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
port->write_urb->transfer_buffer_length);
if (!port->write_urb->transfer_buffer_length) {
dbg ("%s - write urb transfer_buffer_length zero", __FUNCTION__);
dbg ("%s - write urb transfer_buffer_length zero", __func__);
return (0);
}
if (count == 0) {
dbg ("%s - write request of 0 bytes", __FUNCTION__);
dbg ("%s - write request of 0 bytes", __func__);
return (0);
}
spin_lock_bh(&port->lock);
if (port->write_urb_busy) {
spin_unlock_bh(&port->lock);
dbg("%s - already writing", __FUNCTION__);
dbg("%s - already writing", __func__);
return 0;
}
port->write_urb_busy = 1;
@ -332,7 +332,7 @@ static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
port->write_urb->transfer_buffer_length = count;
}
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count, port->write_urb->transfer_buffer);
usb_serial_debug_data(debug, &port->dev, __func__, count, port->write_urb->transfer_buffer);
#ifdef ECHO_TX
{
int i;
@ -349,10 +349,10 @@ static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
port->write_urb->dev = port->serial->dev;
if ((result = usb_submit_urb (port->write_urb, GFP_KERNEL))) {
port->write_urb_busy = 0;
err ("%s - failed submitting write urb, error %d", __FUNCTION__, result);
err ("%s - failed submitting write urb, error %d", __func__, result);
return 0;
}
dbg ("%s urb: %p submitted", __FUNCTION__, port->write_urb);
dbg ("%s urb: %p submitted", __func__, port->write_urb);
return (count);
}
@ -361,7 +361,7 @@ static int safe_write_room (struct usb_serial_port *port)
{
int room = 0; // Default: no room
dbg ("%s", __FUNCTION__);
dbg ("%s", __func__);
if (port->write_urb_busy)
room = port->bulk_out_size - (safe ? 2 : 0);