aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-24 12:04:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-24 12:08:22 -0400
commit92206f47d969724023694b264196847d4c84487f (patch)
tree3da618503ee8eccbc849419fce7600bf24ad2ffc
parentb883052e0176d8c0c3b9375d19749c3897ad1bc2 (diff)
USB: Staging: quatech_usb3: remove err() usage
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>
-rw-r--r--drivers/staging/quatech_usb2/quatech_usb2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index bb977e00cc8..679b249b11c 100644
--- a/drivers/staging/quatech_usb2/quatech_usb2.c
+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
@@ -541,7 +541,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
541 dbg("port->write_urb == NULL, allocating one"); 541 dbg("port->write_urb == NULL, allocating one");
542 port->write_urb = usb_alloc_urb(0, GFP_KERNEL); 542 port->write_urb = usb_alloc_urb(0, GFP_KERNEL);
543 if (!port->write_urb) { 543 if (!port->write_urb) {
544 err("Allocating write URB failed"); 544 dev_err(&port->dev, "Allocating write URB failed\n");
545 return -ENOMEM; 545 return -ENOMEM;
546 } 546 }
547 /* buffer same size as port0 */ 547 /* buffer same size as port0 */
@@ -549,7 +549,7 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
549 port->bulk_out_buffer = kmalloc(port->bulk_out_size, 549 port->bulk_out_buffer = kmalloc(port->bulk_out_size,
550 GFP_KERNEL); 550 GFP_KERNEL);
551 if (!port->bulk_out_buffer) { 551 if (!port->bulk_out_buffer) {
552 err("Couldn't allocate bulk_out_buffer"); 552 dev_err(&port->dev, "Couldn't allocate bulk_out_buffer\n");
553 return -ENOMEM; 553 return -ENOMEM;
554 } 554 }
555 } 555 }