USB: remove use of err() in drivers/usb/serial

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / ezusb.c

diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index cc4fbd9d60be9620532ca5c18da43d9ff406b705..3cfc762f50563a1aad5e0e24185a0a73891abb16 100644 (file)
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/serial/ezusb.c
@@ -20,39 +20,42 @@
 /* EZ-USB Control and Status Register.  Bit 0 controls 8051 reset */
 #define CPUCS_REG    0x7F92
 
-int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *data, int length, __u8 bRequest)
+int ezusb_writememory(struct usb_serial *serial, int address,
+                               unsigned char *data, int length, __u8 request)
 {
        int result;
        unsigned char *transfer_buffer;
 
        /* 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;
        }
 
        transfer_buffer = kmemdup(data, length, GFP_KERNEL);
        if (!transfer_buffer) {
-               dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __func__, length);
+               dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n",
+                                                       __func__, length);
                return -ENOMEM;
        }
-       result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);
-       kfree (transfer_buffer);
+       result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                    request, 0x40, address, 0, transfer_buffer, length, 3000);
+       kfree(transfer_buffer);
        return result;
 }
+EXPORT_SYMBOL_GPL(ezusb_writememory);
 
-int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
+int ezusb_set_reset(struct usb_serial *serial, unsigned char reset_bit)
 {
        int response;
 
        /* dbg("%s - %d", __func__, reset_bit); */
-       response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0);
+       response = ezusb_writememory(serial, CPUCS_REG, &reset_bit, 1, 0xa0);
        if (response < 0)
-               dev_err(&serial->dev->dev, "%s- %d failed\n", __func__, reset_bit);
+               dev_err(&serial->dev->dev, "%s- %d failed\n",
+                                               __func__, reset_bit);
        return response;
 }
-
-
-EXPORT_SYMBOL_GPL(ezusb_writememory);
 EXPORT_SYMBOL_GPL(ezusb_set_reset);