# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.538 -> 1.539 # drivers/usb/serial/kl5kusb105.c 1.11 -> 1.12 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/08/28 greg@kroah.com 1.539 # USB: kl5usb105 driver: fixed __FUNCTION__ usages. # -------------------------------------------- # diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c Wed Aug 28 23:20:59 2002 +++ b/drivers/usb/serial/kl5kusb105.c Wed Aug 28 23:20:59 2002 @@ -135,7 +135,7 @@ .read_bulk_callback =klsi_105_read_bulk_callback, .ioctl = klsi_105_ioctl, .set_termios = klsi_105_set_termios, - /*break_ctl: klsi_105_break_ctl,*/ + /*.break_ctl = klsi_105_break_ctl,*/ .attach = klsi_105_startup, .shutdown = klsi_105_shutdown, .throttle = klsi_105_throttle, @@ -187,7 +187,8 @@ KLSI_TIMEOUT); if (rc < 0) err("Change port settings failed (error = %d)", rc); - info(__FUNCTION__ " - %d byte block, baudrate %x, databits %d, u1 %d, u2 %d", + info("%s - %d byte block, baudrate %x, databits %d, u1 %d, u2 %d", + __FUNCTION__, settings->pktlen, settings->baudrate, settings->databits, settings->unknown1, settings->unknown2); @@ -218,7 +219,7 @@ __u8 status_buf[KLSI_STATUSBUF_LEN] = { -1,-1}; __u16 status; - info(__FUNCTION__ " - sending SIO Poll request"); + info("%s - sending SIO Poll request", __FUNCTION__); rc = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), KL5KUSB105A_SIO_POLL, USB_TYPE_VENDOR | USB_DIR_IN, @@ -232,7 +233,7 @@ else { status = status_buf[0] + (status_buf[1]<<8); - info(__FUNCTION__ " - read status %x %x", + info("%s - read status %x %x", __FUNCTION__, status_buf[0], status_buf[1]); *line_state_p = klsi_105_status2linestate(status); @@ -260,7 +261,7 @@ serial->port[i].private = kmalloc(sizeof(struct klsi_105_private), GFP_KERNEL); if (!serial->port[i].private) { - dbg(__FUNCTION__ "kmalloc for klsi_105_private failed."); + dbg("%skmalloc for klsi_105_private failed.", __FUNCTION__); return (-1); /* error */ } priv = (struct klsi_105_private *)serial->port[i].private; @@ -290,8 +291,7 @@ urb->transfer_buffer = kmalloc (URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL); if (!urb->transfer_buffer) { - err (__FUNCTION__ - " - out of memory for urb buffers."); + err("%s - out of memory for urb buffers.", __FUNCTION__); continue; } } @@ -308,7 +308,7 @@ { int i; - dbg (__FUNCTION__); + dbg("%s", __FUNCTION__); /* stop reads and writes on all ports */ for (i=0; i < serial->num_ports; ++i) { @@ -354,7 +354,7 @@ int i; unsigned long line_state; - dbg(__FUNCTION__" port %d", port->number); + dbg("%s port %d", __FUNCTION__, port->number); /* force low_latency on so that our tty_push actually forces * the data through @@ -394,8 +394,7 @@ rc = usb_submit_urb(port->read_urb, GFP_KERNEL); if (rc) { - err(__FUNCTION__ - " - failed submitting read urb, error %d", rc); + err("%s - failed submitting read urb, error %d", __FUNCTION__, rc); retval = rc; goto exit; } @@ -412,13 +411,12 @@ err("Enabling read failed (error = %d)", rc); retval = rc; } else - dbg(__FUNCTION__ " - enabled reading"); + dbg("%s - enabled reading", __FUNCTION__); rc = klsi_105_get_line_state(serial, &line_state); if (rc >= 0) { priv->line_state = line_state; - dbg(__FUNCTION__ - " - read line state 0x%lx", line_state); + dbg("%s - read line state 0x%lx", __FUNCTION__, line_state); retval = 0; } else retval = rc; @@ -434,7 +432,8 @@ struct klsi_105_private *priv = (struct klsi_105_private *)port->private; int rc; - dbg(__FUNCTION__" port %d", port->number); + + dbg("%s port %d", __FUNCTION__, port->number); serial = get_usb_serial (port, __FUNCTION__); @@ -480,7 +479,7 @@ int result, size; int bytes_sent=0; - dbg(__FUNCTION__ " - port %d", port->number); + dbg("%s - port %d", __FUNCTION__, port->number); while (count > 0) { /* try to find a free urb (write 0 bytes if none) */ @@ -492,21 +491,21 @@ for (i=0; iwrite_urb_pool[i]->status != -EINPROGRESS) { urb = priv->write_urb_pool[i]; - dbg(__FUNCTION__ " - using pool URB %d", i); + dbg("%s - using pool URB %d", __FUNCTION__, i); break; } } spin_unlock_irqrestore (&priv->write_urb_pool_lock, flags); if (urb==NULL) { - dbg (__FUNCTION__ " - no more free urbs"); + dbg("%s - no more free urbs", __FUNCTION__); goto exit; } if (urb->transfer_buffer == NULL) { urb->transfer_buffer = kmalloc (URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC); if (urb->transfer_buffer == NULL) { - err(__FUNCTION__ " - no more kernel memory..."); + err("%s - no more kernel memory...", __FUNCTION__); goto exit; } } @@ -540,8 +539,7 @@ /* send the data out the bulk port */ result = usb_submit_urb(urb, GFP_ATOMIC); if (result) { - err(__FUNCTION__ - " - failed submitting write urb, error %d", result); + err("%s - failed submitting write urb, error %d", __FUNCTION__, result); goto exit; } buf += size; @@ -559,15 +557,15 @@ struct usb_serial_port *port = (struct usb_serial_port *)urb->context; struct usb_serial *serial = port->serial; - dbg(__FUNCTION__ " - port %d", port->number); + dbg("%s - port %d", __FUNCTION__, port->number); if (!serial) { - dbg(__FUNCTION__ " - bad serial pointer, exiting"); + dbg("%s - bad serial pointer, exiting", __FUNCTION__); return; } if (urb->status) { - dbg(__FUNCTION__ " - nonzero write bulk status received: %d", + dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); return; } @@ -599,7 +597,7 @@ spin_unlock_irqrestore (&priv->write_urb_pool_lock, flags); - dbg (__FUNCTION__ " - returns %d", chars); + dbg("%s - returns %d", __FUNCTION__, chars); return (chars); } @@ -620,7 +618,7 @@ spin_unlock_irqrestore (&priv->write_urb_pool_lock, flags); - dbg(__FUNCTION__ " - returns %d", room); + dbg("%s - returns %d", __FUNCTION__, room); return (room); } @@ -636,16 +634,16 @@ unsigned char *data = urb->transfer_buffer; int rc; - dbg(__FUNCTION__ " - port %d", port->number); + dbg("%s - port %d", __FUNCTION__, port->number); /* The urb might have been killed. */ if (urb->status) { - dbg(__FUNCTION__ " - nonzero read bulk status received: %d", + dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); return; } if (!serial) { - dbg(__FUNCTION__ " - bad serial pointer, exiting"); + dbg("%s - bad serial pointer, exiting", __FUNCTION__); return; } @@ -654,10 +652,10 @@ */ if (urb->actual_length == 0) { /* empty urbs seem to happen, we ignore them */ - /* dbg(__FUNCTION__ " - emtpy URB"); */ + /* dbg("%s - emtpy URB", __FUNCTION__); */ ; } else if (urb->actual_length <= 2) { - dbg(__FUNCTION__ " - size %d URB not understood", + dbg("%s - size %d URB not understood", __FUNCTION__, urb->actual_length); usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data); } else { @@ -675,9 +673,8 @@ urb->actual_length, data); if (bytes_sent + 2 > urb->actual_length) { - dbg(__FUNCTION__ - " - trying to read more data than available" - " (%d vs. %d)", + dbg("%s - trying to read more data than available" + " (%d vs. %d)", __FUNCTION__, bytes_sent+2, urb->actual_length); /* cap at implied limit */ bytes_sent = urb->actual_length - 2; @@ -706,8 +703,7 @@ port); rc = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (rc) - err(__FUNCTION__ - " - failed resubmitting read urb, error %d", rc); + err("%s - failed resubmitting read urb, error %d", __FUNCTION__, rc); } /* klsi_105_read_bulk_callback */ @@ -727,7 +723,7 @@ if( (cflag & CBAUD) != (old_cflag & CBAUD) ) { /* reassert DTR and (maybe) RTS on transition from B0 */ if( (old_cflag & CBAUD) == B0 ) { - dbg(__FUNCTION__ ": baud was B0"); + dbg("%s: baud was B0", __FUNCTION__); #if 0 priv->control_state |= TIOCM_DTR; /* don't set RTS if using hardware flow control */ @@ -765,7 +761,7 @@ break; } if ((cflag & CBAUD) == B0 ) { - dbg(__FUNCTION__ ": baud is B0"); + dbg("%s: baud is B0", __FUNCTION__); /* Drop RTS and DTR */ /* maybe this should be simulated by sending read * disable and read enable messages? @@ -782,10 +778,10 @@ /* set the number of data bits */ switch (cflag & CSIZE) { case CS5: - dbg(__FUNCTION__ " - 5 bits/byte not supported"); + dbg("%s - 5 bits/byte not supported", __FUNCTION__); return ; case CS6: - dbg(__FUNCTION__ " - 6 bits/byte not supported"); + dbg("%s - 6 bits/byte not supported", __FUNCTION__); return ; case CS7: priv->cfg.databits = kl5kusb105a_dtb_7; @@ -856,7 +852,7 @@ struct mct_u232_private *priv = (struct mct_u232_private *)port->private; unsigned char lcr = priv->last_lcr; - dbg (__FUNCTION__ "state=%d", break_state); + dbg("%sstate=%d", __FUNCTION__, break_state); if (break_state) lcr |= MCT_U232_SET_BREAK; @@ -872,14 +868,14 @@ struct klsi_105_private *priv = (struct klsi_105_private *)port->private; int mask; - dbg (__FUNCTION__ "cmd=0x%x", cmd); + dbg("%scmd=0x%x", __FUNCTION__, cmd); /* Based on code from acm.c and others */ switch (cmd) { case TIOCMGET: { int rc; unsigned long line_state; - dbg (__FUNCTION__ " - TIOCMGET request, just guessing"); + dbg("%s - TIOCMGET request, just guessing", __FUNCTION__); rc = klsi_105_get_line_state(serial, &line_state); if (rc < 0) { @@ -888,7 +884,7 @@ return -ENOIOCTLCMD; } else { priv->line_state = line_state; - dbg(__FUNCTION__ " - read line state 0x%lx", line_state); + dbg("%s - read line state 0x%lx", __FUNCTION__, line_state); } return put_user(priv->line_state, (unsigned long *) arg); }; @@ -903,10 +899,10 @@ /* RTS needs set */ if( ((cmd == TIOCMSET) && (mask & TIOCM_RTS)) || (cmd == TIOCMBIS) ) - dbg (__FUNCTION__ " - set RTS not handled"); + dbg("%s - set RTS not handled", __FUNCTION__); /* priv->control_state |= TIOCM_RTS; */ else - dbg (__FUNCTION__ " - clear RTS not handled"); + dbg("%s - clear RTS not handled", __FUNCTION__); /* priv->control_state &= ~TIOCM_RTS; */ } @@ -914,10 +910,10 @@ /* DTR needs set */ if( ((cmd == TIOCMSET) && (mask & TIOCM_DTR)) || (cmd == TIOCMBIS) ) - dbg (__FUNCTION__ " - set DTR not handled"); + dbg("%s - set DTR not handled", __FUNCTION__); /* priv->control_state |= TIOCM_DTR; */ else - dbg (__FUNCTION__ " - clear DTR not handled"); + dbg("%s - clear DTR not handled", __FUNCTION__); /* priv->control_state &= ~TIOCM_DTR; */ } /* @@ -928,19 +924,19 @@ case TIOCMIWAIT: /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/ /* TODO */ - dbg (__FUNCTION__ " - TIOCMIWAIT not handled"); + dbg("%s - TIOCMIWAIT not handled", __FUNCTION__); return -ENOIOCTLCMD; case TIOCGICOUNT: /* return count of modemline transitions */ /* TODO */ - dbg (__FUNCTION__ " - TIOCGICOUNT not handled"); + dbg("%s - TIOCGICOUNT not handled", __FUNCTION__); return -ENOIOCTLCMD; case TCGETS: { /* return current info to caller */ int retval; - dbg (__FUNCTION__ " - TCGETS data faked/incomplete"); + dbg("%s - TCGETS data faked/incomplete", __FUNCTION__); retval = verify_area(VERIFY_WRITE, (void *)arg, sizeof(struct termios)); @@ -956,7 +952,7 @@ /* set port termios to the one given by the user */ int retval; - dbg (__FUNCTION__ " - TCSETS not handled"); + dbg("%s - TCSETS not handled", __FUNCTION__); retval = verify_area(VERIFY_READ, (void *)arg, sizeof(struct termios)); @@ -982,7 +978,7 @@ return -ENOIOCTLCMD; } default: - dbg(__FUNCTION__ ": arg not supported - 0x%04x",cmd); + dbg("%s: arg not supported - 0x%04x", __FUNCTION__,cmd); return(-ENOIOCTLCMD); break; } @@ -991,7 +987,7 @@ static void klsi_105_throttle (struct usb_serial_port *port) { - dbg(__FUNCTION__ " - port %d", port->number); + dbg("%s - port %d", __FUNCTION__, port->number); usb_unlink_urb (port->read_urb); } @@ -999,12 +995,12 @@ { int result; - dbg(__FUNCTION__ " - port %d", port->number); + dbg("%s - port %d", __FUNCTION__, port->number); port->read_urb->dev = port->serial->dev; result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) - err(__FUNCTION__ " - failed submitting read urb, error %d", + err("%s - failed submitting read urb, error %d", __FUNCTION__, result); }