1 files changed, 13 insertions, 17 deletions

diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index ad0aca812002..491082aaf103 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -55,11 +55,8 @@
  * for a telephone or fax link.  And ttyGS2 might be something that just
  * needs a simple byte stream interface for some messaging protocol that
  * is managed in userspace ... OBEX, PTP, and MTP have been mentioned.
- */
-
-#define PREFIX  "ttyGS"
-
-/*
+ *
+ *
  * gserial is the lifecycle interface, used by USB functions
  * gs_port is the I/O nexus, used by the tty driver
  * tty_struct links to the tty/filesystem framework
@@ -385,9 +382,9 @@ __acquires(&port->port_lock)
                 list_del(&req->list);
                 req->zero = (gs_buf_data_avail(&port->port_write_buf) == 0);
 
-                pr_vdebug(PREFIX "%d: tx len=%d, 0x%02x 0x%02x 0x%02x ...\n",
-                                port->port_num, len, *((u8 *)req->buf),
-                                *((u8 *)req->buf+1), *((u8 *)req->buf+2));
+                pr_vdebug("ttyGS%d: tx len=%d, 0x%02x 0x%02x 0x%02x ...\n",
+                          port->port_num, len, *((u8 *)req->buf),
+                          *((u8 *)req->buf+1), *((u8 *)req->buf+2));
 
                 /* Drop lock while we call out of driver; completions
                  * could be issued while we do so.  Disconnection may
@@ -503,13 +500,13 @@ static void gs_rx_push(unsigned long _port)
                 switch (req->status) {
                 case -ESHUTDOWN:
                         disconnect = true;
-                        pr_vdebug(PREFIX "%d: shutdown\n", port->port_num);
+                        pr_vdebug("ttyGS%d: shutdown\n", port->port_num);
                         break;
 
                 default:
                         /* presumably a transient fault */
-                        pr_warning(PREFIX "%d: unexpected RX status %d\n",
-                                        port->port_num, req->status);
+                        pr_warn("ttyGS%d: unexpected RX status %d\n",
+                                port->port_num, req->status);
                         /* FALLTHROUGH */
                 case 0:
                         /* normal completion */
@@ -537,9 +534,8 @@ static void gs_rx_push(unsigned long _port)
                         if (count != size) {
                                 /* stop pushing; TTY layer can't handle more */
                                 port->n_read += count;
-                                pr_vdebug(PREFIX "%d: rx block %d/%d\n",
-                                                port->port_num,
-                                                count, req->actual);
+                                pr_vdebug("ttyGS%d: rx block %d/%d\n",
+                                          port->port_num, count, req->actual);
                                 break;
                         }
                         port->n_read = 0;
@@ -569,7 +565,7 @@ static void gs_rx_push(unsigned long _port)
                         if (do_push)
                                 tasklet_schedule(&port->push);
                         else
-                                pr_warning(PREFIX "%d: RX not scheduled?\n",
+                                pr_warn("ttyGS%d: RX not scheduled?\n",
                                         port->port_num);
                 }
         }
@@ -985,7 +981,7 @@ static void gs_unthrottle(struct tty_struct *tty)
                  * read queue backs up enough we'll be NAKing OUT packets.
                  */
                 tasklet_schedule(&port->push);
-                pr_vdebug(PREFIX "%d: unthrottle\n", port->port_num);
+                pr_vdebug("ttyGS%d: unthrottle\n", port->port_num);
         }
         spin_unlock_irqrestore(&port->port_lock, flags);
 }
@@ -1295,7 +1291,7 @@ static int userial_init(void)
                 return -ENOMEM;
 
         gs_tty_driver->driver_name = "g_serial";
-        gs_tty_driver->name = PREFIX;
+        gs_tty_driver->name = "ttyGS";
         /* uses dynamically assigned dev_t values */
 
         gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;