]> git.karo-electronics.de Git - linux-beck.git/commitdiff
USB: Staging: quatech_usb3: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2012 16:04:42 +0000 (09:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2012 16:08:22 +0000 (09:08 -0700)
err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead

Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Kautuk Consul <consul.kautuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/quatech_usb2/quatech_usb2.c

index bb977e00cc868c7f8c8545d70aee6cf7f1dd0907..679b249b11cbfcbba7b593bfa0fc4b58c50c191f 100644 (file)
@@ -541,7 +541,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
                dbg("port->write_urb == NULL, allocating one");
                port->write_urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!port->write_urb) {
-                       err("Allocating write URB failed");
+                       dev_err(&port->dev, "Allocating write URB failed\n");
                        return -ENOMEM;
                }
                /* buffer same size as port0 */
@@ -549,7 +549,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
                port->bulk_out_buffer = kmalloc(port->bulk_out_size,
                                                GFP_KERNEL);
                if (!port->bulk_out_buffer) {
-                       err("Couldn't allocate bulk_out_buffer");
+                       dev_err(&port->dev, "Couldn't allocate bulk_out_buffer\n");
                        return -ENOMEM;
                }
        }