[PATCH v2 2/5] usb: serial: removing redundant __func__

[Oliver Neukum <oneukum@xxxxxxxx>]

dev_dbg already states the function it is called from. Printing
it again is wasted space.

Signed-off-by: Oliver Neukum <oneukum@xxxxxxxx>
---
 drivers/usb/serial/generic.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 85cf469..3f7e3b1 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -221,7 +221,7 @@ int usb_serial_generic_write_room(struct tty_struct *tty)
 	room = kfifo_avail(&port->write_fifo);
 	spin_unlock_irqrestore(&port->lock, flags);
 
-	dev_dbg(&port->dev, "%s - returns %d\n", __func__, room);
+	dev_dbg(&port->dev, "returns %d\n", room);
 	return room;
 }
 
@@ -238,7 +238,7 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)
 	chars = kfifo_len(&port->write_fifo) + port->tx_bytes;
 	spin_unlock_irqrestore(&port->lock, flags);
 
-	dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);
+	dev_dbg(&port->dev, "returns %d\n", chars);
 	return chars;
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_chars_in_buffer);
@@ -261,8 +261,8 @@ void usb_serial_generic_wait_until_sent(struct tty_struct *tty, long timeout)
 	if (timeout)
 		period = min_t(unsigned long, period, timeout);
 
-	dev_dbg(&port->dev, "%s - timeout = %u ms, period = %u ms\n",
-					__func__, jiffies_to_msecs(timeout),
+	dev_dbg(&port->dev, "timeout = %u ms, period = %u ms\n",
+					jiffies_to_msecs(timeout),
 					jiffies_to_msecs(period));
 	expire = jiffies + timeout;
 	while (!port->serial->type->tx_empty(port)) {
@@ -283,7 +283,7 @@ static int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
 	if (!test_and_clear_bit(index, &port->read_urbs_free))
 		return 0;
 
-	dev_dbg(&port->dev, "%s - urb %d\n", __func__, index);
+	dev_dbg(&port->dev, "urb %d\n", index);
 
 	res = usb_submit_urb(port->read_urbs[index], mem_flags);
 	if (res) {
@@ -359,24 +359,20 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb)
 	}
 	set_bit(i, &port->read_urbs_free);
 
-	dev_dbg(&port->dev, "%s - urb %d, len %d\n", __func__, i,
-							urb->actual_length);
+	dev_dbg(&port->dev, "urb %d, len %d\n", i, urb->actual_length);
 	switch (status) {
 	case 0:
 		break;
 	case -ENOENT:
 	case -ECONNRESET:
 	case -ESHUTDOWN:
-		dev_dbg(&port->dev, "%s - urb stopped: %d\n",
-							__func__, status);
+		dev_dbg(&port->dev, "urb stopped: %d\n", status);
 		return;
 	case -EPIPE:
-		dev_err(&port->dev, "%s - urb stopped: %d\n",
-							__func__, status);
+		dev_err(&port->dev, "urb stopped: %d\n", status);
 		return;
 	default:
-		dev_dbg(&port->dev, "%s - nonzero urb status: %d\n",
-							__func__, status);
+		dev_dbg(&port->dev, "nonzero urb status: %d\n", status);
 		goto resubmit;
 	}
 
@@ -418,16 +414,13 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb)
 	case -ENOENT:
 	case -ECONNRESET:
 	case -ESHUTDOWN:
-		dev_dbg(&port->dev, "%s - urb stopped: %d\n",
-							__func__, status);
+		dev_dbg(&port->dev, "urb stopped: %d\n", status);
 		return;
 	case -EPIPE:
-		dev_err_console(port, "%s - urb stopped: %d\n",
-							__func__, status);
+		dev_err_console(port, "urb stopped: %d\n", status);
 		return;
 	default:
-		dev_err_console(port, "%s - nonzero urb status: %d\n",
-							__func__, status);
+		dev_err_console(port, "nonzero urb status: %d\n", status);
 		goto resubmit;
 	}
 
@@ -582,7 +575,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port,
 {
 	struct tty_port *port = &usb_port->port;
 
-	dev_dbg(&usb_port->dev, "%s - status %d\n", __func__, status);
+	dev_dbg(&usb_port->dev, "status %d\n", status);
 
 	if (tty) {
 		struct tty_ldisc *ld = tty_ldisc_ref(tty);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html