USB: remove use of err() in drivers/usb/serial
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 20 Aug 2008 23:56:34 +0000 (16:56 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 17 Oct 2008 21:41:10 +0000 (14:41 -0700)
err() is going away, so switch to dev_err() or printk() if it's really
needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
21 files changed:
drivers/usb/serial/aircable.c
drivers/usb/serial/belkin_sa.c
drivers/usb/serial/cyberjack.c
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/empeg.c
drivers/usb/serial/ezusb.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/ipaq.c
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/mct_u232.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/omninet.c
drivers/usb/serial/safe_serial.c
drivers/usb/serial/spcp8x5.c
drivers/usb/serial/usb-serial.c
drivers/usb/serial/visor.c
drivers/usb/serial/whiteheat.c

index 99fb7dc59c4540911b01a2cd72662dbcd54cf113..537f953bd7f8013c3cd97b5fc269252e5f6e235a 100644 (file)
@@ -220,8 +220,8 @@ static void aircable_send(struct usb_serial_port *port)
 
        buf = kzalloc(count + HCI_HEADER_LENGTH, GFP_ATOMIC);
        if (!buf) {
-               err("%s- kzalloc(%d) failed.", __func__,
-                   count + HCI_HEADER_LENGTH);
+               dev_err(&port->dev, "%s- kzalloc(%d) failed.\n",
+                       __func__, count + HCI_HEADER_LENGTH);
                return;
        }
 
@@ -276,7 +276,7 @@ static void aircable_read(struct work_struct *work)
 
        if (!tty) {
                schedule_work(&priv->rx_work);
-               err("%s - No tty available", __func__);
+               dev_err(&port->dev, "%s - No tty available\n", __func__);
                return ;
        }
 
@@ -336,7 +336,7 @@ static int aircable_attach(struct usb_serial *serial)
 
        priv = kzalloc(sizeof(struct aircable_private), GFP_KERNEL);
        if (!priv) {
-               err("%s- kmalloc(%Zd) failed.", __func__,
+               dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
                        sizeof(struct aircable_private));
                return -ENOMEM;
        }
index bb19f1c2e0d3c66b19b6f5d15fce983157d16403..b7eacad4d48cb4ae34097c8d2ebbe7cb0ad0a363 100644 (file)
@@ -228,7 +228,7 @@ static int  belkin_sa_open(struct tty_struct *tty,
        port->read_urb->dev = port->serial->dev;
        retval = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (retval) {
-               err("usb_submit_urb(read bulk) failed");
+               dev_err(&port->dev, "usb_submit_urb(read bulk) failed\n");
                goto exit;
        }
 
@@ -236,7 +236,7 @@ static int  belkin_sa_open(struct tty_struct *tty,
        retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
        if (retval) {
                usb_kill_urb(port->read_urb);
-               err(" usb_submit_urb(read int) failed");
+               dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
        }
 
 exit:
@@ -342,8 +342,8 @@ static void belkin_sa_read_int_callback(struct urb *urb)
 exit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               err("%s - usb_submit_urb failed with result %d",
-                    __func__, retval);
+               dev_err(&port->dev, "%s - usb_submit_urb failed with "
+                       "result %d\n", __func__, retval);
 }
 
 static void belkin_sa_set_termios(struct tty_struct *tty,
@@ -382,12 +382,12 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                if ((old_cflag & CBAUD) == B0) {
                        control_state |= (TIOCM_DTR|TIOCM_RTS);
                        if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 1) < 0)
-                               err("Set DTR error");
+                               dev_err(&port->dev, "Set DTR error\n");
                        /* don't set RTS if using hardware flow control */
                        if (!(old_cflag & CRTSCTS))
                                if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST
                                                                , 1) < 0)
-                                       err("Set RTS error");
+                                       dev_err(&port->dev, "Set RTS error\n");
                }
        }
 
@@ -403,18 +403,18 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                /* Report the actual baud rate back to the caller */
                tty_encode_baud_rate(tty, baud, baud);
                if (BSA_USB_CMD(BELKIN_SA_SET_BAUDRATE_REQUEST, urb_value) < 0)
-                       err("Set baudrate error");
+                       dev_err(&port->dev, "Set baudrate error\n");
        } else {
                /* Disable flow control */
                if (BSA_USB_CMD(BELKIN_SA_SET_FLOW_CTRL_REQUEST,
                                                BELKIN_SA_FLOW_NONE) < 0)
-                       err("Disable flowcontrol error");
+                       dev_err(&port->dev, "Disable flowcontrol error\n");
                /* Drop RTS and DTR */
                control_state &= ~(TIOCM_DTR | TIOCM_RTS);
                if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 0) < 0)
-                       err("DTR LOW error");
+                       dev_err(&port->dev, "DTR LOW error\n");
                if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, 0) < 0)
-                       err("RTS LOW error");
+                       dev_err(&port->dev, "RTS LOW error\n");
        }
 
        /* set the parity */
@@ -425,7 +425,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                else
                        urb_value = BELKIN_SA_PARITY_NONE;
                if (BSA_USB_CMD(BELKIN_SA_SET_PARITY_REQUEST, urb_value) < 0)
-                       err("Set parity error");
+                       dev_err(&port->dev, "Set parity error\n");
        }
 
        /* set the number of data bits */
@@ -448,7 +448,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                        break;
                }
                if (BSA_USB_CMD(BELKIN_SA_SET_DATA_BITS_REQUEST, urb_value) < 0)
-                       err("Set data bits error");
+                       dev_err(&port->dev, "Set data bits error\n");
        }
 
        /* set the number of stop bits */
@@ -457,7 +457,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                                                : BELKIN_SA_STOP_BITS(1);
                if (BSA_USB_CMD(BELKIN_SA_SET_STOP_BITS_REQUEST,
                                                        urb_value) < 0)
-                       err("Set stop bits error");
+                       dev_err(&port->dev, "Set stop bits error\n");
        }
 
        /* Set flow control */
@@ -478,7 +478,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
                        urb_value &= ~(BELKIN_SA_FLOW_IRTS);
 
                if (BSA_USB_CMD(BELKIN_SA_SET_FLOW_CTRL_REQUEST, urb_value) < 0)
-                       err("Set flow control error");
+                       dev_err(&port->dev, "Set flow control error\n");
        }
 
        /* save off the modified port settings */
@@ -494,7 +494,7 @@ static void belkin_sa_break_ctl(struct tty_struct *tty, int break_state)
        struct usb_serial *serial = port->serial;
 
        if (BSA_USB_CMD(BELKIN_SA_SET_BREAK_REQUEST, break_state ? 1 : 0) < 0)
-               err("Set break_ctl %d", break_state);
+               dev_err(&port->dev, "Set break_ctl %d\n", break_state);
 }
 
 
@@ -554,13 +554,13 @@ static int belkin_sa_tiocmset(struct tty_struct *tty, struct file *file,
 
        retval = BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, rts);
        if (retval < 0) {
-               err("Set RTS error %d", retval);
+               dev_err(&port->dev, "Set RTS error %d\n", retval);
                goto exit;
        }
 
        retval = BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, dtr);
        if (retval < 0) {
-               err("Set DTR error %d", retval);
+               dev_err(&port->dev, "Set DTR error %d\n", retval);
                goto exit;
        }
 exit:
index 068680f9929d743a1eb2f0e97b62619d01d6d183..858bdd038fbc28eb01ef3c5d289f4719b81d1fca 100644 (file)
@@ -141,7 +141,8 @@ static int cyberjack_startup(struct usb_serial *serial)
                result = usb_submit_urb(serial->port[i]->interrupt_in_urb,
                                        GFP_KERNEL);
                if (result)
-                       err(" usb_submit_urb(read int) failed");
+                       dev_err(&serial->dev->dev,
+                               "usb_submit_urb(read int) failed\n");
                dbg("%s - usb_submit_urb(int urb)", __func__);
        }
 
@@ -274,8 +275,9 @@ static int cyberjack_write(struct tty_struct *tty,
                /* send the data out the bulk port */
                result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                if (result) {
-                       err("%s - failed submitting write urb, error %d",
-                                                       __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d",
+                               __func__, result);
                        /* Throw away data. No better idea what to do with it. */
                        priv->wrfilled = 0;
                        priv->wrsent = 0;
@@ -351,7 +353,9 @@ static void cyberjack_read_int_callback(struct urb *urb)
                        port->read_urb->dev = port->serial->dev;
                        result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                        if (result)
-                               err("%s - failed resubmitting read urb, error %d", __func__, result);
+                               dev_err(&port->dev, "%s - failed resubmitting "
+                                       "read urb, error %d\n",
+                                       __func__, result);
                        dbg("%s - usb_submit_urb(read urb)", __func__);
                }
        }
@@ -360,7 +364,7 @@ resubmit:
        port->interrupt_in_urb->dev = port->serial->dev;
        result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
        if (result)
-               err(" usb_submit_urb(read int) failed");
+               dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
        dbg("%s - usb_submit_urb(int urb)", __func__);
 }
 
@@ -414,8 +418,8 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
                port->read_urb->dev = port->serial->dev;
                result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                if (result)
-                       err("%s - failed resubmitting read urb, error %d",
-                               __func__, result);
+                       dev_err(&port->dev, "%s - failed resubmitting read "
+                               "urb, error %d\n", __func__, result);
                dbg("%s - usb_submit_urb(read urb)", __func__);
        }
 }
@@ -462,8 +466,9 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
                /* send the data out the bulk port */
                result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                if (result) {
-                       err("%s - failed submitting write urb, error %d",
-                                                               __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d\n",
+                               __func__, result);
                        /* Throw away data. No better idea what to do with it. */
                        priv->wrfilled = 0;
                        priv->wrsent = 0;
index e0ca809f75f57cc5db658e89731bc8e102395ed8..eae4740d448c22c35d4fcdfd3fcf6e9b9bc2a5b5 100644 (file)
@@ -404,8 +404,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                         retval != -ENODEV);
 
                if (retval != sizeof(feature_buffer)) {
-                       err("%s - failed sending serial line settings - %d",
-                                                       __func__, retval);
+                       dev_err(&port->dev, "%s - failed sending serial "
+                               "line settings - %d\n", __func__, retval);
                        cypress_set_dead(port);
                } else {
                        spin_lock_irqsave(&priv->lock, flags);
@@ -443,7 +443,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                                                && retval != -ENODEV);
 
                if (retval != sizeof(feature_buffer)) {
-                       err("%s - failed to retrieve serial line settings - %d", __func__, retval);
+                       dev_err(&port->dev, "%s - failed to retrieve serial "
+                               "line settings - %d\n", __func__, retval);
                        cypress_set_dead(port);
                        return retval;
                } else {
@@ -476,8 +477,8 @@ static void cypress_set_dead(struct usb_serial_port *port)
        priv->comm_is_ok = 0;
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       err("cypress_m8 suspending failing port %d - interval might be too short",
-           port->number);
+       dev_err(&port->dev, "cypress_m8 suspending failing port %d - "
+               "interval might be too short\n", port->number);
 }
 
 
@@ -679,7 +680,8 @@ static int cypress_open(struct tty_struct *tty,
 
        /* setup the port and start reading from the device */
        if (!port->interrupt_in_urb) {
-               err("%s - interrupt_in_urb is empty!", __func__);
+               dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n",
+                       __func__);
                return -1;
        }
 
@@ -1107,8 +1109,8 @@ static void cypress_set_termios(struct tty_struct *tty,
                data_bits = 3;
                break;
        default:
-               err("%s - CSIZE was set, but not CS5-CS8",
-                               __func__);
+               dev_err(&port->dev, "%s - CSIZE was set, but not CS5-CS8\n",
+                       __func__);
                data_bits = 3;
        }
        spin_lock_irqsave(&priv->lock, flags);
index ebc2918719a0bbbb016c17a21e719ad9ebf9988f..69f84f0ea6fe71c0e319a5d38d21d6da10ecb171 100644 (file)
@@ -661,7 +661,8 @@ static int digi_write_oob_command(struct usb_serial_port *port,
        }
        spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags);
        if (ret)
-               err("%s: usb_submit_urb failed, ret=%d", __func__, ret);
+               dev_err(&port->dev, "%s: usb_submit_urb failed, ret=%d\n",
+                       __func__, ret);
        return ret;
 
 }
@@ -743,7 +744,8 @@ static int digi_write_inb_command(struct usb_serial_port *port,
        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
        if (ret)
-               err("%s: usb_submit_urb failed, ret=%d, port=%d",
+               dev_err(&port->dev,
+                       "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                        __func__, ret, priv->dp_port_num);
        return ret;
 }
@@ -812,7 +814,8 @@ static int digi_set_modem_signals(struct usb_serial_port *port,
        spin_unlock(&port_priv->dp_port_lock);
        spin_unlock_irqrestore(&oob_priv->dp_port_lock, flags);
        if (ret)
-               err("%s: usb_submit_urb failed, ret=%d", __func__, ret);
+               dev_err(&port->dev, "%s: usb_submit_urb failed, ret=%d\n",
+                       __func__, ret);
        return ret;
 }
 
@@ -907,7 +910,8 @@ static void digi_rx_unthrottle(struct tty_struct *tty)
        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 
        if (ret)
-               err("%s: usb_submit_urb failed, ret=%d, port=%d",
+               dev_err(&port->dev,
+                       "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                        __func__, ret, priv->dp_port_num);
 }
 
@@ -1214,7 +1218,8 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
        /* return length of new data written, or error */
        spin_unlock_irqrestore(&priv->dp_port_lock, flags);
        if (ret < 0)
-               err("%s: usb_submit_urb failed, ret=%d, port=%d",
+               dev_err(&port->dev,
+                       "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                        __func__, ret, priv->dp_port_num);
        dbg("digi_write: returning %d", ret);
        return ret;
@@ -1235,14 +1240,16 @@ static void digi_write_bulk_callback(struct urb *urb)
 
        /* port and serial sanity check */
        if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
-               err("%s: port or port->private is NULL, status=%d",
-                   __func__, status);
+               dev_err(&port->dev,
+                       "%s: port or port->private is NULL, status=%d\n",
+                       __func__, status);
                return;
        }
        serial = port->serial;
        if (serial == NULL || (serial_priv = usb_get_serial_data(serial)) == NULL) {
-               err("%s: serial or serial->private is NULL, status=%d",
-                   __func__, status);
+               dev_err(&port->dev,
+                       "%s: serial or serial->private is NULL, status=%d\n",
+                       __func__, status);
                return;
        }
 
@@ -1284,7 +1291,8 @@ static void digi_write_bulk_callback(struct urb *urb)
 
        spin_unlock(&priv->dp_port_lock);
        if (ret)
-               err("%s: usb_submit_urb failed, ret=%d, port=%d",
+               dev_err(&port->dev,
+                       "%s: usb_submit_urb failed, ret=%d, port=%d\n",
                        __func__, ret, priv->dp_port_num);
 }
 
@@ -1518,8 +1526,9 @@ static int digi_startup_device(struct usb_serial *serial)
                port->write_urb->dev = port->serial->dev;
                ret = usb_submit_urb(port->read_urb, GFP_KERNEL);
                if (ret != 0) {
-                       err("%s: usb_submit_urb failed, ret=%d, port=%d",
-                                       __func__, ret, i);
+                       dev_err(&port->dev,
+                               "%s: usb_submit_urb failed, ret=%d, port=%d\n",
+                               __func__, ret, i);
                        break;
                }
        }
@@ -1618,22 +1627,26 @@ static void digi_read_bulk_callback(struct urb *urb)
        dbg("digi_read_bulk_callback: TOP");
 
        /* port sanity check, do not resubmit if port is not valid */
-       if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
-               err("%s: port or port->private is NULL, status=%d",
-                   __func__, status);
+       if (port == NULL)
+               return;
+       priv = usb_get_serial_port_data(port);
+       if (priv == NULL) {
+               dev_err(&port->dev, "%s: port->private is NULL, status=%d\n",
+                       __func__, status);
                return;
        }
        if (port->serial == NULL ||
                (serial_priv = usb_get_serial_data(port->serial)) == NULL) {
-               err("%s: serial is bad or serial->private is NULL, status=%d",
-                       __func__, status);
+               dev_err(&port->dev, "%s: serial is bad or serial->private "
+                       "is NULL, status=%d\n", __func__, status);
                return;
        }
 
        /* do not resubmit urb if it has any status error */
        if (status) {
-               err("%s: nonzero read bulk status: status=%d, port=%d",
-                   __func__, status, priv->dp_port_num);
+               dev_err(&port->dev,
+                       "%s: nonzero read bulk status: status=%d, port=%d\n",
+                       __func__, status, priv->dp_port_num);
                return;
        }
 
@@ -1650,8 +1663,9 @@ static void digi_read_bulk_callback(struct urb *urb)
        urb->dev = port->serial->dev;
        ret = usb_submit_urb(urb, GFP_ATOMIC);
        if (ret != 0) {
-               err("%s: failed resubmitting urb, ret=%d, port=%d",
-                   __func__, ret, priv->dp_port_num);
+               dev_err(&port->dev,
+                       "%s: failed resubmitting urb, ret=%d, port=%d\n",
+                       __func__, ret, priv->dp_port_num);
        }
 
 }
@@ -1687,10 +1701,11 @@ static int digi_read_inb_callback(struct urb *urb)
 
        /* short/multiple packet check */
        if (urb->actual_length != len + 2) {
-               err("%s: INCOMPLETE OR MULTIPLE PACKET, urb->status=%d, "
-                   "port=%d, opcode=%d, len=%d, actual_length=%d, "
-                   "status=%d", __func__, status, priv->dp_port_num,
-                   opcode, len, urb->actual_length, port_status);
+               dev_err(&port->dev, "%s: INCOMPLETE OR MULTIPLE PACKET, "
+                       "urb->status=%d, port=%d, opcode=%d, len=%d, "
+                       "actual_length=%d, status=%d\n", __func__, status,
+                       priv->dp_port_num, opcode, len, urb->actual_length,
+                       port_status);
                return -1;
        }
 
index fdd28e940bc1c4d23fde196500154a823eab3b3a..8a69cce40b6d0ca4c8c4837c66b8d681a0553f2d 100644 (file)
@@ -416,7 +416,7 @@ static int  empeg_startup(struct usb_serial *serial)
        dbg("%s", __func__);
 
        if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
-               err("active config #%d != 1 ??",
+               dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
                        serial->dev->actconfig->desc.bConfigurationValue);
                return -ENODEV;
        }
@@ -499,15 +499,15 @@ static int __init empeg_init(void)
                urb = usb_alloc_urb(0, GFP_KERNEL);
                write_urb_pool[i] = urb;
                if (urb == NULL) {
-                       err("No more urbs???");
+                       printk(KERN_ERR "empeg: No more urbs???\n");
                        continue;
                }
 
                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
                                                                GFP_KERNEL);
                if (!urb->transfer_buffer) {
-                       err("%s - out of memory for urb buffers.",
-                           __func__);
+                       printk(KERN_ERR "empeg: %s - out of memory for urb "
+                              "buffers.", __func__);
                        continue;
                }
        }
index 711e84f6ed82d8d0c0d80d50da5f5b4ec057014f..3cfc762f50563a1aad5e0e24185a0a73891abb16 100644 (file)
@@ -28,7 +28,8 @@ int ezusb_writememory(struct usb_serial *serial, int address,
 
        /* dbg("ezusb_writememory %x, %d", address, length); */
        if (!serial->dev) {
-               err("%s - no physical device present, failing.", __func__);
+               printk(KERN_ERR "ezusb: %s - no physical device present, "
+                      "failing.\n", __func__);
                return -ENODEV;
        }
 
index bcadb1f4f5dd5a268e89e7568d46b9cedd52cd41..51d7bdea2869ae147953fd10bbd7c3984c360aee 100644 (file)
@@ -1327,7 +1327,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
 
        priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
        if (!priv) {
-               err("%s- kmalloc(%Zd) failed.", __func__,
+               dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
                                        sizeof(struct ftdi_private));
                return -ENOMEM;
        }
@@ -1524,8 +1524,9 @@ static int ftdi_open(struct tty_struct *tty,
                        ftdi_read_bulk_callback, port);
        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (result)
-               err("%s - failed submitting read urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed submitting read urb, error %d\n",
+                       __func__, result);
 
 
        return result;
@@ -1559,7 +1560,7 @@ static void ftdi_close(struct tty_struct *tty,
                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                    0, priv->interface, buf, 0,
                                    WDR_TIMEOUT) < 0) {
-                       err("error from flowcontrol urb");
+                       dev_err(&port->dev, "error from flowcontrol urb\n");
                }
 
                /* drop RTS and DTR */
@@ -1624,14 +1625,15 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port,
 
        buffer = kmalloc(transfer_size, GFP_ATOMIC);
        if (!buffer) {
-               err("%s ran out of kernel memory for urb ...", __func__);
+               dev_err(&port->dev,
+                       "%s ran out of kernel memory for urb ...\n", __func__);
                count = -ENOMEM;
                goto error_no_buffer;
        }
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!urb) {
-               err("%s - no more free urbs", __func__);
+               dev_err(&port->dev, "%s - no more free urbs\n", __func__);
                count = -ENOMEM;
                goto error_no_urb;
        }
@@ -1675,8 +1677,9 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port,
 
        status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status) {
-               err("%s - failed submitting write urb, error %d",
-                                                       __func__, status);
+               dev_err(&port->dev,
+                       "%s - failed submitting write urb, error %d\n",
+                       __func__, status);
                count = status;
                goto error;
        } else {
@@ -1783,7 +1786,8 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)
        buffered = (int)priv->tx_outstanding_bytes;
        spin_unlock_irqrestore(&priv->tx_lock, flags);
        if (buffered < 0) {
-               err("%s outstanding tx bytes is negative!", __func__);
+               dev_err(&port->dev, "%s outstanding tx bytes is negative!\n",
+                       __func__);
                buffered = 0;
        }
        return buffered;
@@ -1799,11 +1803,12 @@ static void ftdi_read_bulk_callback(struct urb *urb)
        int status = urb->status;
 
        if (urb->number_of_packets > 0) {
-               err("%s transfer_buffer_length %d actual_length %d number of packets %d",
-                               __func__,
-                               urb->transfer_buffer_length,
-                               urb->actual_length, urb->number_of_packets);
-               err("%s transfer_flags %x ", __func__, urb->transfer_flags);
+               dev_err(&port->dev, "%s transfer_buffer_length %d "
+                       "actual_length %d number of packets %d\n", __func__,
+                       urb->transfer_buffer_length,
+                       urb->actual_length, urb->number_of_packets);
+               dev_err(&port->dev, "%s transfer_flags %x\n", __func__,
+                       urb->transfer_flags);
        }
 
        dbg("%s - port %d", __func__, port->number);
@@ -1824,7 +1829,7 @@ static void ftdi_read_bulk_callback(struct urb *urb)
        }
 
        if (urb != port->read_urb)
-               err("%s - Not my urb!", __func__);
+               dev_err(&port->dev, "%s - Not my urb!\n", __func__);
 
        if (status) {
                /* This will happen at close every time so it is a dbg not an
@@ -1927,7 +1932,8 @@ static void ftdi_process_read(struct work_struct *work)
 
                length = min(PKTSZ, urb->actual_length-packet_offset)-2;
                if (length < 0) {
-                       err("%s - bad packet length: %d", __func__, length+2);
+                       dev_err(&port->dev, "%s - bad packet length: %d\n",
+                               __func__, length+2);
                        length = 0;
                }
 
@@ -2042,8 +2048,9 @@ static void ftdi_process_read(struct work_struct *work)
 
                result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                if (result)
-                       err("%s - failed resubmitting read urb, error %d",
-                                                       __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed resubmitting read urb, error %d\n",
+                               __func__, result);
        }
 out:
        tty_kref_put(tty);
@@ -2072,8 +2079,8 @@ static void ftdi_break_ctl(struct tty_struct *tty, int break_state)
                        FTDI_SIO_SET_DATA_REQUEST_TYPE,
                        urb_value , priv->interface,
                        buf, 0, WDR_TIMEOUT) < 0) {
-               err("%s FAILED to enable/disable break state (state was %d)",
-                                                       __func__, break_state);
+               dev_err(&port->dev, "%s FAILED to enable/disable break state "
+                       "(state was %d)\n", __func__, break_state);
        }
 
        dbg("%s break state is %d - urb is %d", __func__,
@@ -2145,7 +2152,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
                case CS7: urb_value |= 7; dbg("Setting CS7"); break;
                case CS8: urb_value |= 8; dbg("Setting CS8"); break;
                default:
-                       err("CSIZE was set but not CS5-CS8");
+                       dev_err(&port->dev, "CSIZE was set but not CS5-CS8\n");
                }
        }
 
@@ -2158,7 +2165,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                            FTDI_SIO_SET_DATA_REQUEST_TYPE,
                            urb_value , priv->interface,
                            buf, 0, WDR_SHORT_TIMEOUT) < 0) {
-               err("%s FAILED to set databits/stopbits/parity", __func__);
+               dev_err(&port->dev, "%s FAILED to set "
+                       "databits/stopbits/parity\n", __func__);
        }
 
        /* Now do the baudrate */
@@ -2169,14 +2177,17 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                    0, priv->interface,
                                    buf, 0, WDR_TIMEOUT) < 0) {
-                       err("%s error from disable flowcontrol urb", __func__);
+                       dev_err(&port->dev,
+                               "%s error from disable flowcontrol urb\n",
+                               __func__);
                }
                /* Drop RTS and DTR */
                clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
        } else {
                /* set the baudrate determined before */
                if (change_speed(tty, port))
-                       err("%s urb failed to set baudrate", __func__);
+                       dev_err(&port->dev, "%s urb failed to set baudrate\n",
+                               __func__);
                /* Ensure RTS and DTR are raised when baudrate changed from 0 */
                if (!old_termios || (old_termios->c_cflag & CBAUD) == B0)
                        set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
@@ -2192,7 +2203,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                    0 , (FTDI_SIO_RTS_CTS_HS | priv->interface),
                                    buf, 0, WDR_TIMEOUT) < 0) {
-                       err("urb failed to set to rts/cts flow control");
+                       dev_err(&port->dev,
+                               "urb failed to set to rts/cts flow control\n");
                }
 
        } else {
@@ -2223,7 +2235,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                            urb_value , (FTDI_SIO_XON_XOFF_HS
                                                         | priv->interface),
                                            buf, 0, WDR_TIMEOUT) < 0) {
-                               err("urb failed to set to xon/xoff flow control");
+                               dev_err(&port->dev, "urb failed to set to "
+                                       "xon/xoff flow control\n");
                        }
                } else {
                        /* else clause to only run if cflag ! CRTSCTS and iflag
@@ -2236,7 +2249,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                            FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                            0, priv->interface,
                                            buf, 0, WDR_TIMEOUT) < 0) {
-                               err("urb failed to clear flow control");
+                               dev_err(&port->dev,
+                                       "urb failed to clear flow control\n");
                        }
                }
 
index eb95efdfbe8be8ed4aabf5136b5ed1345b37f43d..e85c8c0d1ad95bd967e1c5dc894648e8b32ac275 100644 (file)
@@ -3109,13 +3109,13 @@ static int edge_startup(struct usb_serial *serial)
                                edge_serial->interrupt_read_urb =
                                                usb_alloc_urb(0, GFP_KERNEL);
                                if (!edge_serial->interrupt_read_urb) {
-                                       err("out of memory");
+                                       dev_err(&dev->dev, "out of memory\n");
                                        return -ENOMEM;
                                }
                                edge_serial->interrupt_in_buffer =
                                        kmalloc(buffer_size, GFP_KERNEL);
                                if (!edge_serial->interrupt_in_buffer) {
-                                       err("out of memory");
+                                       dev_err(&dev->dev, "out of memory\n");
                                        usb_free_urb(edge_serial->interrupt_read_urb);
                                        return -ENOMEM;
                                }
@@ -3146,13 +3146,13 @@ static int edge_startup(struct usb_serial *serial)
                                edge_serial->read_urb =
                                                usb_alloc_urb(0, GFP_KERNEL);
                                if (!edge_serial->read_urb) {
-                                       err("out of memory");
+                                       dev_err(&dev->dev, "out of memory\n");
                                        return -ENOMEM;
                                }
                                edge_serial->bulk_in_buffer =
                                        kmalloc(buffer_size, GFP_KERNEL);
                                if (!edge_serial->bulk_in_buffer) {
-                                       err("out of memory");
+                                       dev_err(&dev->dev, "out of memory\n");
                                        usb_free_urb(edge_serial->read_urb);
                                        return -ENOMEM;
                                }
@@ -3181,7 +3181,8 @@ static int edge_startup(struct usb_serial *serial)
                }
 
                if (!interrupt_in_found || !bulk_in_found || !bulk_out_found) {
-                       err("Error - the proper endpoints were not found!");
+                       dev_err(&dev->dev, "Error - the proper endpoints "
+                               "were not found!\n");
                        return -ENODEV;
                }
 
@@ -3190,8 +3191,9 @@ static int edge_startup(struct usb_serial *serial)
                response = usb_submit_urb(edge_serial->interrupt_read_urb,
                                                                GFP_KERNEL);
                if (response)
-                       err("%s - Error %d submitting control urb",
-                                                       __func__, response);
+                       dev_err(&dev->dev,
+                               "%s - Error %d submitting control urb\n",
+                               __func__, response);
        }
        return response;
 }
index 5108cbc64a55481ae8519521986c5872b24b1842..132be74d2b890dbe7c868b4cbc33f10cc8311516 100644 (file)
@@ -608,7 +608,7 @@ static int ipaq_open(struct tty_struct *tty,
        bytes_out = 0;
        priv = kmalloc(sizeof(struct ipaq_private), GFP_KERNEL);
        if (priv == NULL) {
-               err("%s - Out of memory", __func__);
+               dev_err(&port->dev, "%s - Out of memory\n", __func__);
                return -ENOMEM;
        }
        usb_set_serial_port_data(port, priv);
@@ -693,8 +693,7 @@ static int ipaq_open(struct tty_struct *tty,
        }
 
        if (!retries && result) {
-               err("%s - failed doing control urb, error %d", __func__,
-                   result);
+               dev_err(&port->dev, "%s - failed doing control urb, error %d\n",                        __func__, result);
                goto error;
        }
 
@@ -707,8 +706,9 @@ static int ipaq_open(struct tty_struct *tty,
 
        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (result) {
-               err("%s - failed submitting read urb, error %d",
-                                               __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed submitting read urb, error %d\n",
+                       __func__, result);
                goto error;
        }
 
@@ -716,7 +716,7 @@ static int ipaq_open(struct tty_struct *tty,
 
 enomem:
        result = -ENOMEM;
-       err("%s - Out of memory", __func__);
+       dev_err(&port->dev, "%s - Out of memory\n", __func__);
 error:
        ipaq_destroy_lists(port);
        kfree(priv);
@@ -781,8 +781,9 @@ static void ipaq_read_bulk_callback(struct urb *urb)
            ipaq_read_bulk_callback, port);
        result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
        if (result)
-               err("%s - failed resubmitting read urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed resubmitting read urb, error %d\n",
+                       __func__, result);
        return;
 }
 
@@ -847,7 +848,8 @@ static int ipaq_write_bulk(struct usb_serial_port *port,
                spin_unlock_irqrestore(&write_list_lock, flags);
                result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                if (result)
-                       err("%s - failed submitting write urb, error %d",
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d\n",
                                __func__, result);
        } else {
                spin_unlock_irqrestore(&write_list_lock, flags);
@@ -909,8 +911,9 @@ static void ipaq_write_bulk_callback(struct urb *urb)
                spin_unlock_irqrestore(&write_list_lock, flags);
                result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                if (result)
-                       err("%s - failed submitting write urb, error %d",
-                                       __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d\n",
+                               __func__, result);
        } else {
                priv->active = 0;
                spin_unlock_irqrestore(&write_list_lock, flags);
@@ -957,7 +960,7 @@ static int ipaq_startup(struct usb_serial *serial)
 {
        dbg("%s", __func__);
        if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
-               err("active config #%d != 1 ??",
+               dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
                        serial->dev->actconfig->desc.bConfigurationValue);
                return -ENODEV;
        }
index 2928ba844394e4715efe9ecac621054fea4eaf0a..bf1ae247da66133f64ee79d57f15ef6619f82aa2 100644 (file)
@@ -742,11 +742,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
                fw_name = "keyspan_pda/xircom_pgs.fw";
 #endif
        else {
-               err("%s: unknown vendor, aborting.", __func__);
+               dev_err(&serial->dev->dev, "%s: unknown vendor, aborting.\n",
+                       __func__);
                return -ENODEV;
        }
        if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) {
-               err("failed to load firmware \"%s\"\n", fw_name);
+               dev_err(&serial->dev->dev, "failed to load firmware \"%s\"\n",
+                       fw_name);
                return -ENOENT;
        }
        record = (const struct ihex_binrec *)fw->data;
@@ -756,10 +758,10 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
                                             (unsigned char *)record->data,
                                             be16_to_cpu(record->len), 0xa0);
                if (response < 0) {
-                       err("ezusb_writememory failed for Keyspan PDA "
-                           "firmware (%d %04X %p %d)",
-                           response, be32_to_cpu(record->addr),
-                           record->data, be16_to_cpu(record->len));
+                       dev_err(&serial->dev->dev, "ezusb_writememory failed "
+                               "for Keyspan PDA firmware (%d %04X %p %d)\n",
+                               response, be32_to_cpu(record->addr),
+                               record->data, be16_to_cpu(record->len));
                        break;
                }
                record = ihex_next_binrec(record);
index 573c6972fae76653efb242435672152285f39ae6..dc36a052766fc2015dd3574a5c0ac3020cd32d5a 100644 (file)
@@ -182,7 +182,8 @@ static int klsi_105_chg_port_settings(struct usb_serial_port *port,
                        sizeof(struct klsi_105_port_settings),
                        KLSI_TIMEOUT);
        if (rc < 0)
-               err("Change port settings failed (error = %d)", rc);
+               dev_err(&port->dev,
+                       "Change port settings failed (error = %d)\n", rc);
        dev_info(&port->serial->dev->dev,
                 "%d byte block, baudrate %x, databits %d, u1 %d, u2 %d\n",
                 settings->pktlen, settings->baudrate, settings->databits,
@@ -225,7 +226,8 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
                             10000
                             );
        if (rc < 0)
-               err("Reading line status failed (error = %d)", rc);
+               dev_err(&port->dev, "Reading line status failed (error = %d)\n",
+                       rc);
        else {
                status = get_unaligned_le16(status_buf);
 
@@ -279,15 +281,16 @@ static int klsi_105_startup(struct usb_serial *serial)
 
                        priv->write_urb_pool[j] = urb;
                        if (urb == NULL) {
-                               err("No more urbs???");
+                               dev_err(&serial->dev->dev, "No more urbs???\n");
                                goto err_cleanup;
                        }
 
                        urb->transfer_buffer =
                                kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
                        if (!urb->transfer_buffer) {
-                               err("%s - out of memory for urb buffers.",
-                                                               __func__);
+                               dev_err(&serial->dev->dev,
+                                       "%s - out of memory for urb buffers.\n",
+                                       __func__);
                                goto err_cleanup;
                        }
                }
@@ -408,7 +411,8 @@ static int  klsi_105_open(struct tty_struct *tty,
 
        rc = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (rc) {
-               err("%s - failed submitting read urb, error %d", __func__, rc);
+               dev_err(&port->dev, "%s - failed submitting read urb, "
+                       "error %d\n", __func__, rc);
                retval = rc;
                goto exit;
        }
@@ -423,7 +427,7 @@ static int  klsi_105_open(struct tty_struct *tty,
                             0,
                             KLSI_TIMEOUT);
        if (rc < 0) {
-               err("Enabling read failed (error = %d)", rc);
+               dev_err(&port->dev, "Enabling read failed (error = %d)\n", rc);
                retval = rc;
        } else
                dbg("%s - enabled reading", __func__);
@@ -463,7 +467,8 @@ static void klsi_105_close(struct tty_struct *tty,
                                     NULL, 0,
                                     KLSI_TIMEOUT);
                if (rc < 0)
-                       err("Disabling read failed (error = %d)", rc);
+                       dev_err(&port->dev,
+                               "Disabling read failed (error = %d)\n", rc);
        }
        mutex_unlock(&port->serial->disc_mutex);
 
@@ -522,7 +527,9 @@ static int klsi_105_write(struct tty_struct *tty,
                        urb->transfer_buffer =
                                kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC);
                        if (urb->transfer_buffer == NULL) {
-                               err("%s - no more kernel memory...", __func__);
+                               dev_err(&port->dev,
+                                       "%s - no more kernel memory...\n",
+                                       __func__);
                                goto exit;
                        }
                }
@@ -549,8 +556,9 @@ static int klsi_105_write(struct tty_struct *tty,
                /* send the data out the bulk port */
                result = usb_submit_urb(urb, GFP_ATOMIC);
                if (result) {
-                       err("%s - failed submitting write urb, error %d",
-                                                       __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d\n",
+                               __func__, result);
                        goto exit;
                }
                buf += size;
@@ -694,8 +702,9 @@ static void klsi_105_read_bulk_callback(struct urb *urb)
                      port);
        rc = usb_submit_urb(port->read_urb, GFP_ATOMIC);
        if (rc)
-               err("%s - failed resubmitting read urb, error %d",
-                                                       __func__, rc);
+               dev_err(&port->dev,
+                       "%s - failed resubmitting read urb, error %d\n",
+                       __func__, rc);
 } /* klsi_105_read_bulk_callback */
 
 
@@ -799,7 +808,8 @@ static void klsi_105_set_termios(struct tty_struct *tty,
                        priv->cfg.databits = kl5kusb105a_dtb_8;
                        break;
                default:
-                       err("CSIZE was not CS5-CS8, using default of 8");
+                       dev_err(&port->dev,
+                               "CSIZE was not CS5-CS8, using default of 8\n");
                        priv->cfg.databits = kl5kusb105a_dtb_8;
                        break;
                }
@@ -886,7 +896,8 @@ static int klsi_105_tiocmget(struct tty_struct *tty, struct file *file)
 
        rc = klsi_105_get_line_state(port, &line_state);
        if (rc < 0) {
-               err("Reading line control failed (error = %d)", rc);
+               dev_err(&port->dev,
+                       "Reading line control failed (error = %d)\n", rc);
                /* better return value? EAGAIN? */
                return rc;
        }
@@ -944,8 +955,9 @@ static void klsi_105_unthrottle(struct tty_struct *tty)
        port->read_urb->dev = port->serial->dev;
        result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
        if (result)
-               err("%s - failed submitting read urb, error %d", __func__,
-                   result);
+               dev_err(&port->dev,
+                       "%s - failed submitting read urb, error %d\n",
+                       __func__, result);
 }
 
 
index 29fa66ea2d2104f4bd482f2aaee8a56cef0d93e3..07710cf31d0d23ddd83afce4411264c418132afc 100644 (file)
@@ -246,7 +246,8 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
                                0, 0, &divisor, MCT_U232_SET_BAUD_RATE_SIZE,
                                WDR_TIMEOUT);
        if (rc < 0)     /*FIXME: What value speed results */
-               err("Set BAUD RATE %d failed (error = %d)", value, rc);
+               dev_err(&port->dev, "Set BAUD RATE %d failed (error = %d)\n",
+                       value, rc);
        else
                tty_encode_baud_rate(tty, speed, speed);
        dbg("set_baud_rate: value: 0x%x, divisor: 0x%x", value, divisor);
@@ -274,8 +275,9 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
                                0, 0, &zero_byte, MCT_U232_SET_UNKNOWN1_SIZE,
                                WDR_TIMEOUT);
        if (rc < 0)
-               err("Sending USB device request code %d failed (error = %d)",
-                   MCT_U232_SET_UNKNOWN1_REQUEST, rc);
+               dev_err(&port->dev, "Sending USB device request code %d "
+                       "failed (error = %d)\n", MCT_U232_SET_UNKNOWN1_REQUEST,
+                       rc);
 
        if (port && C_CRTSCTS(tty))
           cts_enable_byte = 1;
@@ -288,8 +290,8 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
                        0, 0, &cts_enable_byte, MCT_U232_SET_CTS_SIZE,
                        WDR_TIMEOUT);
        if (rc < 0)
-               err("Sending USB device request code %d failed (error = %d)",
-                                       MCT_U232_SET_CTS_REQUEST, rc);
+               dev_err(&port->dev, "Sending USB device request code %d "
+                       "failed (error = %d)\n", MCT_U232_SET_CTS_REQUEST, rc);
 
        return rc;
 } /* mct_u232_set_baud_rate */
@@ -303,7 +305,8 @@ static int mct_u232_set_line_ctrl(struct usb_serial *serial, unsigned char lcr)
                        0, 0, &lcr, MCT_U232_SET_LINE_CTRL_SIZE,
                        WDR_TIMEOUT);
        if (rc < 0)
-               err("Set LINE CTRL 0x%x failed (error = %d)", lcr, rc);
+               dev_err(&serial->dev->dev,
+                       "Set LINE CTRL 0x%x failed (error = %d)\n", lcr, rc);
        dbg("set_line_ctrl: 0x%x", lcr);
        return rc;
 } /* mct_u232_set_line_ctrl */
@@ -325,7 +328,8 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
                        0, 0, &mcr, MCT_U232_SET_MODEM_CTRL_SIZE,
                        WDR_TIMEOUT);
        if (rc < 0)
-               err("Set MODEM CTRL 0x%x failed (error = %d)", mcr, rc);
+               dev_err(&serial->dev->dev,
+                       "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
        dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 
        return rc;
@@ -341,7 +345,8 @@ static int mct_u232_get_modem_stat(struct usb_serial *serial,
                        0, 0, msr, MCT_U232_GET_MODEM_STAT_SIZE,
                        WDR_TIMEOUT);
        if (rc < 0) {
-               err("Get MODEM STATus failed (error = %d)", rc);
+               dev_err(&serial->dev->dev,
+                       "Get MODEM STATus failed (error = %d)\n", rc);
                *msr = 0;
        }
        dbg("get_modem_stat: 0x%x", *msr);
@@ -470,8 +475,9 @@ static int  mct_u232_open(struct tty_struct *tty,
        port->read_urb->dev = port->serial->dev;
        retval = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (retval) {
-               err("usb_submit_urb(read bulk) failed pipe 0x%x err %d",
-                   port->read_urb->pipe, retval);
+               dev_err(&port->dev,
+                       "usb_submit_urb(read bulk) failed pipe 0x%x err %d\n",
+                       port->read_urb->pipe, retval);
                goto error;
        }
 
@@ -479,8 +485,9 @@ static int  mct_u232_open(struct tty_struct *tty,
        retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
        if (retval) {
                usb_kill_urb(port->read_urb);
-               err(" usb_submit_urb(read int) failed pipe 0x%x err %d",
-                   port->interrupt_in_urb->pipe, retval);
+               dev_err(&port->dev,
+                       "usb_submit_urb(read int) failed pipe 0x%x err %d",
+                       port->interrupt_in_urb->pipe, retval);
                goto error;
        }
        return 0;
@@ -612,8 +619,9 @@ static void mct_u232_read_int_callback(struct urb *urb)
 exit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               err("%s - usb_submit_urb failed with result %d",
-                    __func__, retval);
+               dev_err(&port->dev,
+                       "%s - usb_submit_urb failed with result %d\n",
+                       __func__, retval);
 } /* mct_u232_read_int_callback */
 
 static void mct_u232_set_termios(struct tty_struct *tty,
@@ -680,7 +688,8 @@ static void mct_u232_set_termios(struct tty_struct *tty,
        case CS8:
                last_lcr |= MCT_U232_DATA_BITS_8; break;
        default:
-               err("CSIZE was not CS5-CS8, using default of 8");
+               dev_err(&port->dev,
+                       "CSIZE was not CS5-CS8, using default of 8\n");
                last_lcr |= MCT_U232_DATA_BITS_8;
                break;
        }
index 5711aa55d24b4e6446d37a3b4debaa785663d6bb..e772cc0a97fd483ba193f75ddb6b92906f9952bc 100644 (file)
@@ -355,14 +355,16 @@ static int mos7720_open(struct tty_struct *tty,
                mos7720_port->write_urb_pool[j] = urb;
 
                if (urb == NULL) {
-                       err("No more urbs???");
+                       dev_err(&port->dev, "No more urbs???\n");
                        continue;
                }
 
                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
                                               GFP_KERNEL);
                if (!urb->transfer_buffer) {
-                       err("%s-out of memory for urb buffers.", __func__);
+                       dev_err(&port->dev,
+                               "%s-out of memory for urb buffers.\n",
+                               __func__);
                        usb_free_urb(mos7720_port->write_urb_pool[j]);
                        mos7720_port->write_urb_pool[j] = NULL;
                        continue;
@@ -694,7 +696,8 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
                                               GFP_KERNEL);
                if (urb->transfer_buffer == NULL) {
-                       err("%s no more kernel memory...", __func__);
+                       dev_err(&port->dev, "%s no more kernel memory...\n",
+                               __func__);
                        goto exit;
                }
        }
@@ -714,8 +717,8 @@ static int mos7720_write(struct tty_struct *tty, struct usb_serial_port *port,
        /* send it down the pipe */
        status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status) {
-               err("%s - usb_submit_urb(write bulk) failed with status = %d",
-                   __func__, status);
+               dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
+                       "with status = %d\n", __func__, status);
                bytes_sent = status;
                goto exit;
        }
@@ -975,7 +978,7 @@ static int send_cmd_write_baud_rate(struct moschip_port *mos7720_port,
        /* Calculate the Divisor */
        status = calc_baud_rate_divisor(baudrate, &divisor);
        if (status) {
-               err("%s - bad baud rate", __func__);
+               dev_err(&port->dev, "%s - bad baud rate\n", __func__);
                return status;
        }
 
@@ -1478,7 +1481,7 @@ static int mos7720_startup(struct usb_serial *serial)
        /* create our private serial structure */
        mos7720_serial = kzalloc(sizeof(struct moschip_serial), GFP_KERNEL);
        if (mos7720_serial == NULL) {
-               err("%s - Out of memory", __func__);
+               dev_err(&dev->dev, "%s - Out of memory\n", __func__);
                return -ENOMEM;
        }
 
@@ -1491,7 +1494,7 @@ static int mos7720_startup(struct usb_serial *serial)
        for (i = 0; i < serial->num_ports; ++i) {
                mos7720_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);
                if (mos7720_port == NULL) {
-                       err("%s - Out of memory", __func__);
+                       dev_err(&dev->dev, "%s - Out of memory\n", __func__);
                        usb_set_serial_data(serial, NULL);
                        kfree(mos7720_serial);
                        return -ENOMEM;
index d5f682626e7123ba41144846d665467d2f006846..fda4a6421c44226abf6d905a707eb5e4f5bec505 100644 (file)
@@ -844,7 +844,7 @@ static int mos7840_open(struct tty_struct *tty,
                mos7840_port->write_urb_pool[j] = urb;
 
                if (urb == NULL) {
-                       err("No more urbs???");
+                       dev_err(&port->dev, "No more urbs???\n");
                        continue;
                }
 
@@ -853,7 +853,9 @@ static int mos7840_open(struct tty_struct *tty,
                if (!urb->transfer_buffer) {
                        usb_free_urb(urb);
                        mos7840_port->write_urb_pool[j] = NULL;
-                       err("%s-out of memory for urb buffers.", __func__);
+                       dev_err(&port->dev,
+                               "%s-out of memory for urb buffers.\n",
+                               __func__);
                        continue;
                }
        }
@@ -1021,8 +1023,8 @@ static int mos7840_open(struct tty_struct *tty,
                            usb_submit_urb(serial->port[0]->interrupt_in_urb,
                                           GFP_KERNEL);
                        if (response) {
-                               err("%s - Error %d submitting interrupt urb",
-                                   __func__, response);
+                               dev_err(&port->dev, "%s - Error %d submitting "
+                                       "interrupt urb\n", __func__, response);
                        }
 
                }
@@ -1055,8 +1057,8 @@ static int mos7840_open(struct tty_struct *tty,
            port->bulk_in_endpointAddress);
        response = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
        if (response) {
-               err("%s - Error %d submitting control urb", __func__,
-                   response);
+               dev_err(&port->dev, "%s - Error %d submitting control urb\n",
+                       __func__, response);
        }
 
        /* initialize our wait queues */
@@ -1492,7 +1494,8 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
                    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
 
                if (urb->transfer_buffer == NULL) {
-                       err("%s no more kernel memory...", __func__);
+                       dev_err(&port->dev, "%s no more kernel memory...\n",
+                               __func__);
                        goto exit;
                }
        }
@@ -1517,8 +1520,8 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
 
        if (status) {
                mos7840_port->busy[i] = 0;
-               err("%s - usb_submit_urb(write bulk) failed with status = %d",
-                   __func__, status);
+               dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
+                       "with status = %d\n", __func__, status);
                bytes_sent = status;
                goto exit;
        }
@@ -1856,8 +1859,7 @@ static int mos7840_send_cmd_write_baud_rate(struct moschip_port *mos7840_port,
                /* Calculate the Divisor */
 
                if (status) {
-                       err("%s - bad baud rate", __func__);
-                       dbg("%s\n", "bad baud rate");
+                       dev_err(&port->dev, "%s - bad baud rate\n", __func__);
                        return status;
                }
                /* Enable access to divisor latch */
@@ -2446,7 +2448,7 @@ static int mos7840_startup(struct usb_serial *serial)
        for (i = 0; i < serial->num_ports; ++i) {
                mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);
                if (mos7840_port == NULL) {
-                       err("%s - Out of memory", __func__);
+                       dev_err(&dev->dev, "%s - Out of memory\n", __func__);
                        status = -ENOMEM;
                        i--; /* don't follow NULL pointer cleaning up */
                        goto error;
index 9890f26cd91d22c576a2e15b8e32aee4232aa1e5..df6539712726b93b8c007ecea018a5ed9ea4cb50 100644 (file)
@@ -154,8 +154,8 @@ static int omninet_attach(struct usb_serial *serial)
 
        od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL);
        if (!od) {
-               err("%s- kmalloc(%Zd) failed.",
-                               __func__, sizeof(struct omninet_data));
+               dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n",
+                       __func__, sizeof(struct omninet_data));
                return -ENOMEM;
        }
        usb_set_serial_port_data(port, od);
@@ -183,8 +183,9 @@ static int omninet_open(struct tty_struct *tty,
                        omninet_read_bulk_callback, port);
        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
        if (result)
-               err("%s - failed submitting read urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed submitting read urb, error %d\n",
+                       __func__, result);
        return result;
 }
 
@@ -244,8 +245,9 @@ static void omninet_read_bulk_callback(struct urb *urb)
                        omninet_read_bulk_callback, port);
        result = usb_submit_urb(urb, GFP_ATOMIC);
        if (result)
-               err("%s - failed resubmitting read urb, error %d",
-                                               __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed resubmitting read urb, error %d\n",
+                       __func__, result);
 
        return;
 }
@@ -298,8 +300,9 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
        result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
        if (result) {
                wport->write_urb_busy = 0;
-               err("%s - failed submitting write urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed submitting write urb, error %d\n",
+                       __func__, result);
        } else
                result = count;
 
index 40cff61cb4a23b18c92527b918c39d288046278a..4b463cd140ef6436b392a8a5255c6c6cf5d523b5 100644 (file)
@@ -256,11 +256,12 @@ static void safe_read_bulk_callback(struct urb *urb)
                                                        data, actual_length);
                                tty_flip_buffer_push(tty);
                        } else {
-                               err("%s - inconsistent lengths %d:%d",
+                               dev_err(&port->dev,
+                                       "%s - inconsistent lengths %d:%d\n",
                                        __func__, actual_length, length);
                        }
                } else {
-                       err("%s - bad CRC %x", __func__, fcs);
+                       dev_err(&port->dev, "%s - bad CRC %x\n", __func__, fcs);
                }
        } else {
                tty_insert_flip_string(tty, data, length);
@@ -277,8 +278,9 @@ static void safe_read_bulk_callback(struct urb *urb)
 
        result = usb_submit_urb(urb, GFP_ATOMIC);
        if (result)
-               err("%s - failed resubmitting read urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed resubmitting read urb, error %d\n",
+                       __func__, result);
                /* FIXME: Need a mechanism to retry later if this happens */
 }
 
@@ -369,8 +371,9 @@ static int safe_write(struct tty_struct *tty, struct usb_serial_port *port,
        result = usb_submit_urb(port->write_urb, GFP_KERNEL);
        if (result) {
                port->write_urb_busy = 0;
-               err("%s - failed submitting write urb, error %d",
-                                                       __func__, result);
+               dev_err(&port->dev,
+                       "%s - failed submitting write urb, error %d\n",
+                       __func__, result);
                return 0;
        }
        dbg("%s urb: %p submitted", __func__, port->write_urb);
index 96aeec746191b8d06472477834bd7a7431724788..a65bc2bd8e710f0cd32d61777de7c0630be9077a 100644 (file)
@@ -589,8 +589,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        case 1000000:
                        buf[0] = 0x0b;  break;
        default:
-               err("spcp825 driver does not support the baudrate "
-                   "requested, using default of 9600.");
+               dev_err(&port->dev, "spcp825 driver does not support the "
+                       "baudrate requested, using default of 9600.\n");
        }
 
        /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */
@@ -629,7 +629,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
                            SET_UART_FORMAT_TYPE, SET_UART_FORMAT,
                            uartdata, 0, NULL, 0, 100);
        if (i < 0)
-               err("Set UART format %#x failed (error = %d)", uartdata, i);
+               dev_err(&port->dev, "Set UART format %#x failed (error = %d)\n",
+                       uartdata, i);
        dbg("0x21:0x40:0:0  %d\n", i);
 
        if (cflag & CRTSCTS) {
index 92ba4f7361e47c835d31681d70f5af772341619e..8be3f39891c71c705c61a8a3d95ff53e3289300b 100644 (file)
@@ -1121,7 +1121,8 @@ static int __init usb_serial_init(void)
 
        result = bus_register(&usb_serial_bus_type);
        if (result) {
-               err("%s - registering bus driver failed", __func__);
+               printk(KERN_ERR "usb-serial: %s - registering bus driver "
+                      "failed\n", __func__);
                goto exit_bus;
        }
 
@@ -1142,21 +1143,24 @@ static int __init usb_serial_init(void)
        tty_set_operations(usb_serial_tty_driver, &serial_ops);
        result = tty_register_driver(usb_serial_tty_driver);
        if (result) {
-               err("%s - tty_register_driver failed", __func__);
+               printk(KERN_ERR "usb-serial: %s - tty_register_driver failed\n",
+                      __func__);
                goto exit_reg_driver;
        }
 
        /* register the USB driver */
        result = usb_register(&usb_serial_driver);
        if (result < 0) {
-               err("%s - usb_register failed", __func__);
+               printk(KERN_ERR "usb-serial: %s - usb_register failed\n",
+                      __func__);
                goto exit_tty;
        }
 
        /* register the generic driver, if we should */
        result = usb_serial_generic_register(debug);
        if (result < 0) {
-               err("%s - registering generic driver failed", __func__);
+               printk(KERN_ERR "usb-serial: %s - registering generic "
+                      "driver failed\n", __func__);
                goto exit_generic;
        }
 
@@ -1174,7 +1178,8 @@ exit_reg_driver:
        bus_unregister(&usb_serial_bus_type);
 
 exit_bus:
-       err("%s - returning with error %d", __func__, result);
+       printk(KERN_ERR "usb-serial: %s - returning with error %d\n",
+              __func__, result);
        put_tty_driver(usb_serial_tty_driver);
        return result;
 }
@@ -1233,8 +1238,8 @@ int usb_serial_register(struct usb_serial_driver *driver)
 
        retval = usb_serial_bus_register(driver);
        if (retval) {
-               err("problem %d when registering driver %s",
-                                               retval, driver->description);
+               printk(KERN_ERR "usb-serial: problem %d when registering "
+                      "driver %s\n", retval, driver->description);
                list_del(&driver->driver_list);
        } else
                printk(KERN_INFO "USB Serial support registered for %s\n",
index de4b5f0e7f3d67e1a3e18e8e8a213d98dacb71e5..4facce3d936434480617dd4be0875655895ffbb0 100644 (file)
@@ -768,7 +768,7 @@ static int visor_probe(struct usb_serial *serial,
        dbg("%s", __func__);
 
        if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
-               err("active config #%d != 1 ??",
+               dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
                        serial->dev->actconfig->desc.bConfigurationValue);
                return -ENODEV;
        }
index 39f7f8d291d6ec8669d9a0ca0c65a22f4fbc9073..5335d3211c073c1c661d895aeaa0488fa0196ba1 100644 (file)
@@ -303,12 +303,15 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
 
        if (request_ihex_firmware(&firmware_fw, "whiteheat.fw",
                                  &serial->dev->dev)) {
-               err("%s - request \"whiteheat.fw\" failed", __func__);
+               dev_err(&serial->dev->dev,
+                       "%s - request \"whiteheat.fw\" failed\n", __func__);
                goto out;
        }
        if (request_ihex_firmware(&loader_fw, "whiteheat_loader.fw",
                             &serial->dev->dev)) {
-               err("%s - request \"whiteheat_loader.fw\" failed", __func__);
+               dev_err(&serial->dev->dev,
+                       "%s - request \"whiteheat_loader.fw\" failed\n",
+                       __func__);
                goto out;
        }
        ret = 0;
@@ -320,9 +323,10 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
                                              (unsigned char *)record->data,
                                              be16_to_cpu(record->len), 0xa0);
                if (response < 0) {
-                       err("%s - ezusb_writememory failed for loader (%d %04X %p %d)",
-                           __func__, response, be32_to_cpu(record->addr),
-                           record->data, be16_to_cpu(record->len));
+                       dev_err(&serial->dev->dev, "%s - ezusb_writememory "
+                               "failed for loader (%d %04X %p %d)\n",
+                               __func__, response, be32_to_cpu(record->addr),
+                               record->data, be16_to_cpu(record->len));
                        break;
                }
                record = ihex_next_binrec(record);
@@ -338,9 +342,11 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
                                              (unsigned char *)record->data,
                                              be16_to_cpu(record->len), 0xa3);
                if (response < 0) {
-                       err("%s - ezusb_writememory failed for first firmware step (%d %04X %p %d)", 
-                           __func__, response, be32_to_cpu(record->addr),
-                           record->data, be16_to_cpu(record->len));
+                       dev_err(&serial->dev->dev, "%s - ezusb_writememory "
+                               "failed for first firmware step "
+                               "(%d %04X %p %d)\n", __func__, response,
+                               be32_to_cpu(record->addr), record->data,
+                               be16_to_cpu(record->len));
                        break;
                }
                ++record;
@@ -354,9 +360,11 @@ static int whiteheat_firmware_download(struct usb_serial *serial,
                                              (unsigned char *)record->data,
                                              be16_to_cpu(record->len), 0xa0);
                if (response < 0) {
-                       err("%s - ezusb_writememory failed for second firmware step (%d %04X %p %d)", 
-                           __func__, response, be32_to_cpu(record->addr),
-                           record->data, be16_to_cpu(record->len));
+                       dev_err(&serial->dev->dev, "%s - ezusb_writememory "
+                               "failed for second firmware step "
+                               "(%d %04X %p %d)\n", __func__, response,
+                               be32_to_cpu(record->addr), record->data,
+                               be16_to_cpu(record->len));
                        break;
                }
                ++record;
@@ -421,12 +429,12 @@ static int whiteheat_attach(struct usb_serial *serial)
        ret = usb_bulk_msg(serial->dev, pipe, command, 2,
                                                &alen, COMMAND_TIMEOUT_MS);
        if (ret) {
-               err("%s: Couldn't send command [%d]",
-                               serial->type->description, ret);
+               dev_err(&serial->dev->dev, "%s: Couldn't send command [%d]\n",
+                       serial->type->description, ret);
                goto no_firmware;
        } else if (alen != 2) {
-               err("%s: Send command incomplete [%d]",
-                               serial->type->description, alen);
+               dev_err(&serial->dev->dev, "%s: Send command incomplete [%d]\n",
+                       serial->type->description, alen);
                goto no_firmware;
        }
 
@@ -437,16 +445,16 @@ static int whiteheat_attach(struct usb_serial *serial)
        ret = usb_bulk_msg(serial->dev, pipe, result,
                        sizeof(*hw_info) + 1, &alen, COMMAND_TIMEOUT_MS);
        if (ret) {
-               err("%s: Couldn't get results [%d]",
-                               serial->type->description, ret);
+               dev_err(&serial->dev->dev, "%s: Couldn't get results [%d]\n",
+                       serial->type->description, ret);
                goto no_firmware;
        } else if (alen != sizeof(*hw_info) + 1) {
-               err("%s: Get results incomplete [%d]",
-                               serial->type->description, alen);
+               dev_err(&serial->dev->dev, "%s: Get results incomplete [%d]\n",
+                       serial->type->description, alen);
                goto no_firmware;
        } else if (result[0] != command[0]) {
-               err("%s: Command failed [%d]",
-                               serial->type->description, result[0]);
+               dev_err(&serial->dev->dev, "%s: Command failed [%d]\n",
+                       serial->type->description, result[0]);
                goto no_firmware;
        }
 
@@ -461,8 +469,9 @@ static int whiteheat_attach(struct usb_serial *serial)
 
                info = kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL);
                if (info == NULL) {
-                       err("%s: Out of memory for port structures\n",
-                                       serial->type->description);
+                       dev_err(&port->dev,
+                               "%s: Out of memory for port structures\n",
+                               serial->type->description);
                        goto no_private;
                }
 
@@ -482,18 +491,20 @@ static int whiteheat_attach(struct usb_serial *serial)
                for (j = 0; j < urb_pool_size; j++) {
                        urb = usb_alloc_urb(0, GFP_KERNEL);
                        if (!urb) {
-                               err("No free urbs available");
+                               dev_err(&port->dev, "No free urbs available\n");
                                goto no_rx_urb;
                        }
                        buf_size = port->read_urb->transfer_buffer_length;
                        urb->transfer_buffer = kmalloc(buf_size, GFP_KERNEL);
                        if (!urb->transfer_buffer) {
-                               err("Couldn't allocate urb buffer");
+                               dev_err(&port->dev,
+                                       "Couldn't allocate urb buffer\n");
                                goto no_rx_buf;
                        }
                        wrap = kmalloc(sizeof(*wrap), GFP_KERNEL);
                        if (!wrap) {
-                               err("Couldn't allocate urb wrapper");
+                               dev_err(&port->dev,
+                                       "Couldn't allocate urb wrapper\n");
                                goto no_rx_wrap;
                        }
                        usb_fill_bulk_urb(urb, serial->dev,
@@ -506,18 +517,20 @@ static int whiteheat_attach(struct usb_serial *serial)
 
                        urb = usb_alloc_urb(0, GFP_KERNEL);
                        if (!urb) {
-                               err("No free urbs available");
+                               dev_err(&port->dev, "No free urbs available\n");
                                goto no_tx_urb;
                        }
                        buf_size = port->write_urb->transfer_buffer_length;
                        urb->transfer_buffer = kmalloc(buf_size, GFP_KERNEL);
                        if (!urb->transfer_buffer) {
-                               err("Couldn't allocate urb buffer");
+                               dev_err(&port->dev,
+                                       "Couldn't allocate urb buffer\n");
                                goto no_tx_buf;
                        }
                        wrap = kmalloc(sizeof(*wrap), GFP_KERNEL);
                        if (!wrap) {
-                               err("Couldn't allocate urb wrapper");
+                               dev_err(&port->dev,
+                                       "Couldn't allocate urb wrapper\n");
                                goto no_tx_wrap;
                        }
                        usb_fill_bulk_urb(urb, serial->dev,
@@ -535,8 +548,9 @@ static int whiteheat_attach(struct usb_serial *serial)
        command_info = kmalloc(sizeof(struct whiteheat_command_private),
                                                                GFP_KERNEL);
        if (command_info == NULL) {
-               err("%s: Out of memory for port structures\n",
-                                       serial->type->description);
+               dev_err(&serial->dev->dev,
+                       "%s: Out of memory for port structures\n",
+                       serial->type->description);
                goto no_command_private;
        }
 
@@ -553,12 +567,15 @@ static int whiteheat_attach(struct usb_serial *serial)
 
 no_firmware:
        /* Firmware likely not running */
-       err("%s: Unable to retrieve firmware version, try replugging\n",
-                                       serial->type->description);
-       err("%s: If the firmware is not running (status led not blinking)\n",
-                                       serial->type->description);
-       err("%s: please contact support@connecttech.com\n",
-                                       serial->type->description);
+       dev_err(&serial->dev->dev,
+               "%s: Unable to retrieve firmware version, try replugging\n",
+               serial->type->description);
+       dev_err(&serial->dev->dev,
+               "%s: If the firmware is not running (status led not blinking)\n",
+               serial->type->description);
+       dev_err(&serial->dev->dev,
+               "%s: please contact support@connecttech.com\n",
+               serial->type->description);
        kfree(result);
        return -ENODEV;
 
@@ -681,8 +698,9 @@ static int whiteheat_open(struct tty_struct *tty,
        /* Start reading from the device */
        retval = start_port_read(port);
        if (retval) {
-               err("%s - failed submitting read urb, error %d",
-                               __func__, retval);
+               dev_err(&port->dev,
+                       "%s - failed submitting read urb, error %d\n",
+                       __func__, retval);
                firm_close(port);
                stop_command_port(port->serial);
                goto exit;
@@ -807,8 +825,9 @@ static int whiteheat_write(struct tty_struct *tty,
                urb->transfer_buffer_length = bytes;
                result = usb_submit_urb(urb, GFP_ATOMIC);
                if (result) {
-                       err("%s - failed submitting write urb, error %d",
-                                                       __func__, result);
+                       dev_err(&port->dev,
+                               "%s - failed submitting write urb, error %d\n",
+                               __func__, result);
                        sent = result;
                        spin_lock_irqsave(&info->lock, flags);
                        list_add(tmp, &info->tx_urbs_free);
@@ -1076,7 +1095,7 @@ static void whiteheat_read_callback(struct urb *urb)
        wrap = urb_to_wrap(urb, &info->rx_urbs_submitted);
        if (!wrap) {
                spin_unlock(&info->lock);
-               err("%s - Not my urb!", __func__);
+               dev_err(&port->dev, "%s - Not my urb!\n", __func__);
                return;
        }
        list_del(&wrap->list);
@@ -1120,7 +1139,7 @@ static void whiteheat_write_callback(struct urb *urb)
        wrap = urb_to_wrap(urb, &info->tx_urbs_submitted);
        if (!wrap) {
                spin_unlock(&info->lock);
-               err("%s - Not my urb!", __func__);
+               dev_err(&port->dev, "%s - Not my urb!\n", __func__);
                return;
        }
        list_move(&wrap->list, &info->tx_urbs_free);
@@ -1384,8 +1403,9 @@ static int start_command_port(struct usb_serial *serial)
                command_port->read_urb->dev = serial->dev;
                retval = usb_submit_urb(command_port->read_urb, GFP_KERNEL);
                if (retval) {
-                       err("%s - failed submitting read urb, error %d",
-                                                       __func__, retval);
+                       dev_err(&serial->dev->dev,
+                               "%s - failed submitting read urb, error %d\n",
+                               __func__, retval);
                        goto exit;
                }
        }
@@ -1523,7 +1543,8 @@ static void rx_data_softint(struct work_struct *work)
                urb->dev = port->serial->dev;
                result = usb_submit_urb(urb, GFP_ATOMIC);
                if (result) {
-                       err("%s - failed resubmitting read urb, error %d",
+                       dev_err(&port->dev,
+                               "%s - failed resubmitting read urb, error %d\n",
                                __func__, result);
                        spin_lock_irqsave(&info->lock, flags);
                        list_add(tmp, &info->rx_urbs_free);