Skip to content

L
linux
Commit e8b4e61a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

USB: digi_acceleport driver: fixed __FUNCTION__ usages.

parent 3ef6008c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 17 deletions
drivers/usb/serial/digi_acceleport.c
View file @ e8b4e61a
...@@ -684,7 +684,7 @@ dbg( "digi_write_oob_command: TOP: port=%d, count=%d", oob_priv->dp_port_num, co ...@@ -684,7 +684,7 @@ dbg( "digi_write_oob_command: TOP: port=%d, count=%d", oob_priv->dp_port_num, co
spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags ); spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags );
if( ret ) { if( ret ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d", err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__,
ret ); ret );
} }
...@@ -773,7 +773,7 @@ count ); ...@@ -773,7 +773,7 @@ count );
spin_unlock_irqrestore( &priv->dp_port_lock, flags ); spin_unlock_irqrestore( &priv->dp_port_lock, flags );
if( ret ) { if( ret ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d", err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
ret, priv->dp_port_num ); ret, priv->dp_port_num );
} }
...@@ -849,7 +849,7 @@ port_priv->dp_port_num, modem_signals ); ...@@ -849,7 +849,7 @@ port_priv->dp_port_num, modem_signals );
spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags ); spin_unlock_irqrestore( &oob_priv->dp_port_lock, flags );
if( ret ) { if( ret ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d", err("%s: usb_submit_urb failed, ret=%d", __FUNCTION__,
ret ); ret );
} }
...@@ -970,7 +970,7 @@ dbg( "digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num ); ...@@ -970,7 +970,7 @@ dbg( "digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num );
spin_unlock_irqrestore( &priv->dp_port_lock, flags ); spin_unlock_irqrestore( &priv->dp_port_lock, flags );
if( ret ) { if( ret ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d", err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
ret, priv->dp_port_num ); ret, priv->dp_port_num );
} }
...@@ -1329,7 +1329,7 @@ priv->dp_port_num, count, from_user, in_interrupt() ); ...@@ -1329,7 +1329,7 @@ priv->dp_port_num, count, from_user, in_interrupt() );
/* return length of new data written, or error */ /* return length of new data written, or error */
spin_unlock_irqrestore( &priv->dp_port_lock, flags ); spin_unlock_irqrestore( &priv->dp_port_lock, flags );
if( ret < 0 ) { if( ret < 0 ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d", err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
ret, priv->dp_port_num ); ret, priv->dp_port_num );
} }
...@@ -1352,13 +1352,13 @@ dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status ); ...@@ -1352,13 +1352,13 @@ dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status );
/* port and serial sanity check */ /* port and serial sanity check */
if( port == NULL || (priv=(struct digi_port *)(port->private)) == NULL ) { if( port == NULL || (priv=(struct digi_port *)(port->private)) == NULL ) {
err( __FUNCTION__ ": port or port->private is NULL, status=%d", err("%s: port or port->private is NULL, status=%d", __FUNCTION__,
urb->status ); urb->status );
return; return;
} }
serial = port->serial; serial = port->serial;
if( serial == NULL || serial->private == NULL ) { if( serial == NULL || serial->private == NULL ) {
err( __FUNCTION__ ": serial or serial->private is NULL, status=%d", urb->status ); err("%s: serial or serial->private is NULL, status=%d", __FUNCTION__, urb->status );
return; return;
} }
...@@ -1413,7 +1413,7 @@ dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status ); ...@@ -1413,7 +1413,7 @@ dbg( "digi_write_bulk_callback: TOP, urb->status=%d", urb->status );
spin_unlock( &priv->dp_port_lock ); spin_unlock( &priv->dp_port_lock );
if( ret ) { if( ret ) {
err( __FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d", err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
ret, priv->dp_port_num ); ret, priv->dp_port_num );
} }
...@@ -1655,8 +1655,7 @@ static int digi_startup_device( struct usb_serial *serial ) ...@@ -1655,8 +1655,7 @@ static int digi_startup_device( struct usb_serial *serial )
port->write_urb->dev = port->serial->dev; port->write_urb->dev = port->serial->dev;
if( (ret=usb_submit_urb(port->read_urb, GFP_KERNEL)) != 0 ) { if( (ret=usb_submit_urb(port->read_urb, GFP_KERNEL)) != 0 ) {
err( err("%s: usb_submit_urb failed, ret=%d, port=%d", __FUNCTION__,
__FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d",
ret, i ); ret, i );
break; break;
} }
...@@ -1773,20 +1772,20 @@ dbg( "digi_read_bulk_callback: TOP" ); ...@@ -1773,20 +1772,20 @@ dbg( "digi_read_bulk_callback: TOP" );
/* port sanity check, do not resubmit if port is not valid */ /* port sanity check, do not resubmit if port is not valid */
if( port == NULL || (priv=(struct digi_port *)(port->private)) == NULL ) { if( port == NULL || (priv=(struct digi_port *)(port->private)) == NULL ) {
err( __FUNCTION__ ": port or port->private is NULL, status=%d", err("%s: port or port->private is NULL, status=%d", __FUNCTION__,
urb->status ); urb->status );
return; return;
} }
if( port->serial == NULL if( port->serial == NULL
|| serial_paranoia_check( port->serial, __FUNCTION__ ) || serial_paranoia_check( port->serial, __FUNCTION__ )
|| port->serial->private == NULL ) { || port->serial->private == NULL ) {
err( __FUNCTION__ ": serial is bad or serial->private is NULL, status=%d", urb->status ); err("%s: serial is bad or serial->private is NULL, status=%d", __FUNCTION__, urb->status );
return; return;
} }
/* do not resubmit urb if it has any status error */ /* do not resubmit urb if it has any status error */
if( urb->status ) { if( urb->status ) {
err( __FUNCTION__ ": nonzero read bulk status: status=%d, port=%d", urb->status, priv->dp_port_num ); err("%s: nonzero read bulk status: status=%d, port=%d", __FUNCTION__, urb->status, priv->dp_port_num );
return; return;
} }
...@@ -1803,7 +1802,7 @@ dbg( "digi_read_bulk_callback: TOP" ); ...@@ -1803,7 +1802,7 @@ dbg( "digi_read_bulk_callback: TOP" );
/* continue read */ /* continue read */
urb->dev = port->serial->dev; urb->dev = port->serial->dev;
if( (ret=usb_submit_urb(urb, GFP_ATOMIC)) != 0 ) { if( (ret=usb_submit_urb(urb, GFP_ATOMIC)) != 0 ) {
err( __FUNCTION__ ": failed resubmitting urb, ret=%d, port=%d", err("%s: failed resubmitting urb, ret=%d, port=%d", __FUNCTION__,
ret, priv->dp_port_num ); ret, priv->dp_port_num );
} }
...@@ -1844,7 +1843,7 @@ static int digi_read_inb_callback( struct urb *urb ) ...@@ -1844,7 +1843,7 @@ static int digi_read_inb_callback( struct urb *urb )
/* short/multiple packet check */ /* short/multiple packet check */
if( urb->actual_length != len + 2 ) { if( urb->actual_length != len + 2 ) {
err( __FUNCTION__ ": INCOMPLETE OR MULTIPLE PACKET, urb->status=%d, port=%d, opcode=%d, len=%d, actual_length=%d, status=%d", urb->status, priv->dp_port_num, opcode, len, urb->actual_length, status ); err("%s: INCOMPLETE OR MULTIPLE PACKET, urb->status=%d, port=%d, opcode=%d, len=%d, actual_length=%d, status=%d", __FUNCTION__, urb->status, priv->dp_port_num, opcode, len, urb->actual_length, status );
return( -1 ); return( -1 );
} }
...@@ -1913,9 +1912,9 @@ static int digi_read_inb_callback( struct urb *urb ) ...@@ -1913,9 +1912,9 @@ static int digi_read_inb_callback( struct urb *urb )
spin_unlock( &priv->dp_port_lock ); spin_unlock( &priv->dp_port_lock );
if( opcode == DIGI_CMD_RECEIVE_DISABLE ) { if( opcode == DIGI_CMD_RECEIVE_DISABLE ) {
dbg( __FUNCTION__ ": got RECEIVE_DISABLE" ); dbg("%s: got RECEIVE_DISABLE", __FUNCTION__ );
} else if( opcode != DIGI_CMD_RECEIVE_DATA ) { } else if( opcode != DIGI_CMD_RECEIVE_DATA ) {
dbg( __FUNCTION__ ": unknown opcode: %d", opcode ); dbg("%s: unknown opcode: %d", __FUNCTION__, opcode );
} }
return( throttled ? 1 : 0 ); return( throttled ? 1 : 0 );
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7