From e3eb3e3342d560c94ea5ad812466a13ec4a8fd55 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Sep 2012 17:41:48 -0700 Subject: [PATCH] --- yaml --- r: 326029 b: refs/heads/master c: 7b5ba275dfa8858e66aad8641874cf88c1ed0651 h: refs/heads/master i: 326027: c68aa275e00275a687d790377eeeebdaf75d9a8b v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/omninet.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9b93b981c750..ac3c4c873473 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e00609d857962ebecfba7deab834a52087b2454 +refs/heads/master: 7b5ba275dfa8858e66aad8641874cf88c1ed0651 diff --git a/trunk/drivers/usb/serial/omninet.c b/trunk/drivers/usb/serial/omninet.c index 6f3d7051c7f4..d31f661d758c 100644 --- a/trunk/drivers/usb/serial/omninet.c +++ b/trunk/drivers/usb/serial/omninet.c @@ -167,8 +167,8 @@ static void omninet_read_bulk_callback(struct urb *urb) int i; if (status) { - dbg("%s - nonzero read bulk status received: %d", - __func__, status); + dev_dbg(&port->dev, "%s - nonzero read bulk status received: %d\n", + __func__, status); return; } @@ -212,12 +212,12 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, int result; if (count == 0) { - dbg("%s - write request of 0 bytes", __func__); + dev_dbg(&port->dev, "%s - write request of 0 bytes\n", __func__); return 0; } if (!test_and_clear_bit(0, &port->write_urbs_free)) { - dbg("%s - already writing", __func__); + dev_dbg(&port->dev, "%s - already writing\n", __func__); return 0; } @@ -261,7 +261,7 @@ static int omninet_write_room(struct tty_struct *tty) if (test_bit(0, &wport->write_urbs_free)) room = wport->bulk_out_size - OMNINET_HEADERLEN; - dbg("%s - returns %d", __func__, room); + dev_dbg(&port->dev, "%s - returns %d\n", __func__, room); return room; } @@ -275,8 +275,8 @@ static void omninet_write_bulk_callback(struct urb *urb) set_bit(0, &port->write_urbs_free); if (status) { - dbg("%s - nonzero write bulk status received: %d", - __func__, status); + dev_dbg(&port->dev, "%s - nonzero write bulk status received: %d\n", + __func__, status); return; }