USB: replace remaining __FUNCTION__ occurrences
__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
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
14722ef4ac
commit
441b62c1ed
@ -118,7 +118,7 @@ int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)
|
||||
int result = 0;
|
||||
unsigned long flags;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
/* force low_latency on so that our tty_push actually forces the data through,
|
||||
otherwise it is scheduled, and with high data rates (like with OHCI) data
|
||||
@ -145,7 +145,7 @@ int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)
|
||||
port);
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result)
|
||||
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __func__, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -156,7 +156,7 @@ static void generic_cleanup (struct usb_serial_port *port)
|
||||
{
|
||||
struct usb_serial *serial = port->serial;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (serial->dev) {
|
||||
/* shutdown any bulk reads that might be going on */
|
||||
@ -194,7 +194,7 @@ int usb_serial_generic_resume(struct usb_serial *serial)
|
||||
|
||||
void usb_serial_generic_close (struct usb_serial_port *port, struct file * filp)
|
||||
{
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
generic_cleanup (port);
|
||||
}
|
||||
|
||||
@ -204,10 +204,10 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
|
||||
int result;
|
||||
unsigned char *data;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (count == 0) {
|
||||
dbg("%s - write request of 0 bytes", __FUNCTION__);
|
||||
dbg("%s - write request of 0 bytes", __func__);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
if (port->write_urb_busy) {
|
||||
spin_unlock_irqrestore(&port->lock, flags);
|
||||
dbg("%s - already writing", __FUNCTION__);
|
||||
dbg("%s - already writing", __func__);
|
||||
return 0;
|
||||
}
|
||||
port->write_urb_busy = 1;
|
||||
@ -227,7 +227,7 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
|
||||
|
||||
memcpy (port->write_urb->transfer_buffer, buf, count);
|
||||
data = port->write_urb->transfer_buffer;
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count, data);
|
||||
usb_serial_debug_data(debug, &port->dev, __func__, count, data);
|
||||
|
||||
/* set up our urb */
|
||||
usb_fill_bulk_urb (port->write_urb, serial->dev,
|
||||
@ -242,7 +242,7 @@ int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
|
||||
port->write_urb_busy = 1;
|
||||
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
|
||||
if (result) {
|
||||
dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __func__, result);
|
||||
/* don't have to grab the lock here, as we will retry if != 0 */
|
||||
port->write_urb_busy = 0;
|
||||
} else
|
||||
@ -260,14 +260,14 @@ int usb_serial_generic_write_room (struct usb_serial_port *port)
|
||||
struct usb_serial *serial = port->serial;
|
||||
int room = 0;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (serial->num_bulk_out) {
|
||||
if (!(port->write_urb_busy))
|
||||
room = port->bulk_out_size;
|
||||
}
|
||||
|
||||
dbg("%s - returns %d", __FUNCTION__, room);
|
||||
dbg("%s - returns %d", __func__, room);
|
||||
return (room);
|
||||
}
|
||||
|
||||
@ -276,14 +276,14 @@ int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port)
|
||||
struct usb_serial *serial = port->serial;
|
||||
int chars = 0;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (serial->num_bulk_out) {
|
||||
if (port->write_urb_busy)
|
||||
chars = port->write_urb->transfer_buffer_length;
|
||||
}
|
||||
|
||||
dbg("%s - returns %d", __FUNCTION__, chars);
|
||||
dbg("%s - returns %d", __func__, chars);
|
||||
return (chars);
|
||||
}
|
||||
|
||||
@ -305,7 +305,7 @@ static void resubmit_read_urb(struct usb_serial_port *port, gfp_t mem_flags)
|
||||
usb_serial_generic_read_bulk_callback), port);
|
||||
result = usb_submit_urb(urb, mem_flags);
|
||||
if (result)
|
||||
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __func__, result);
|
||||
}
|
||||
|
||||
/* Push data to tty layer and resubmit the bulk read URB */
|
||||
@ -334,15 +334,15 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb)
|
||||
int status = urb->status;
|
||||
unsigned long flags;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
if (unlikely(status != 0)) {
|
||||
dbg("%s - nonzero read bulk status received: %d",
|
||||
__FUNCTION__, status);
|
||||
__func__, status);
|
||||
return;
|
||||
}
|
||||
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
|
||||
usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
|
||||
|
||||
/* Throttle the device if requested by tty */
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
@ -360,12 +360,12 @@ void usb_serial_generic_write_bulk_callback (struct urb *urb)
|
||||
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
|
||||
int status = urb->status;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
port->write_urb_busy = 0;
|
||||
if (status) {
|
||||
dbg("%s - nonzero write bulk status received: %d",
|
||||
__FUNCTION__, status);
|
||||
__func__, status);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -377,7 +377,7 @@ void usb_serial_generic_throttle (struct usb_serial_port *port)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
/* Set the throttle request flag. It will be picked up
|
||||
* by usb_serial_generic_read_bulk_callback(). */
|
||||
@ -391,7 +391,7 @@ void usb_serial_generic_unthrottle (struct usb_serial_port *port)
|
||||
int was_throttled;
|
||||
unsigned long flags;
|
||||
|
||||
dbg("%s - port %d", __FUNCTION__, port->number);
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
|
||||
/* Clear the throttle flags */
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
@ -409,7 +409,7 @@ void usb_serial_generic_shutdown (struct usb_serial *serial)
|
||||
{
|
||||
int i;
|
||||
|
||||
dbg("%s", __FUNCTION__);
|
||||
dbg("%s", __func__);
|
||||
|
||||
/* stop reads and writes on all ports */
|
||||
for (i=0; i < serial->num_ports; ++i) {
|
||||
|
||||
Reference in New Issue
Block a user