tty: Remove __func__ from tty_debug() macro

Now that tty_debug() macro uses pr_debug(), the function name can
be printed when using dynamic debug; printing the function name within
the format string is redundant.

Remove the __func__ parameter and print specifier from the format string.
Add context to messages for when the function name is not printed by
dynamic debug, or when dynamic debug is not enabled.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index a45660f62db5..b3110040164a 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -788,7 +788,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
         if (retval)
                 goto err_release;
 
-        tty_debug_hangup(tty, "(tty count=%d)\n", tty->count);
+        tty_debug_hangup(tty, "opening (count=%d)\n", tty->count);
 
         tty_unlock(tty);
         return 0;
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index d9df15f1086b..f8e1fce9bdfd 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -783,7 +783,7 @@ static void do_tty_hangup(struct work_struct *work)
 
 void tty_hangup(struct tty_struct *tty)
 {
-        tty_debug_hangup(tty, "\n");
+        tty_debug_hangup(tty, "hangup\n");
         schedule_work(&tty->hangup_work);
 }
 
@@ -800,7 +800,7 @@ EXPORT_SYMBOL(tty_hangup);
 
 void tty_vhangup(struct tty_struct *tty)
 {
-        tty_debug_hangup(tty, "\n");
+        tty_debug_hangup(tty, "vhangup\n");
         __tty_hangup(tty, 0);
 }
 
@@ -837,7 +837,7 @@ void tty_vhangup_self(void)
 
 static void tty_vhangup_session(struct tty_struct *tty)
 {
-        tty_debug_hangup(tty, "\n");
+        tty_debug_hangup(tty, "session hangup\n");
         __tty_hangup(tty, 1);
 }
 
@@ -1787,7 +1787,7 @@ int tty_release(struct inode *inode, struct file *filp)
                 return 0;
         }
 
-        tty_debug_hangup(tty, "(tty count=%d)...\n", tty->count);
+        tty_debug_hangup(tty, "releasing (count=%d)\n", tty->count);
 
         if (tty->ops->close)
                 tty->ops->close(tty, filp);
@@ -1903,7 +1903,7 @@ int tty_release(struct inode *inode, struct file *filp)
         /* Wait for pending work before tty destruction commmences */
         tty_flush_works(tty);
 
-        tty_debug_hangup(tty, "freeing structure...\n");
+        tty_debug_hangup(tty, "freeing structure\n");
         /*
          * The release_tty function takes care of the details of clearing
          * the slots and preserving the termios structure. The tty_unlock_pair
@@ -2093,7 +2093,7 @@ retry_open:
             tty->driver->subtype == PTY_TYPE_MASTER)
                 noctty = 1;
 
-        tty_debug_hangup(tty, "(tty count=%d)\n", tty->count);
+        tty_debug_hangup(tty, "opening (count=%d)\n", tty->count);
 
         if (tty->ops->open)
                 retval = tty->ops->open(tty, filp);
@@ -2102,7 +2102,7 @@ retry_open:
         filp->f_flags = saved_flags;
 
         if (retval) {
-                tty_debug_hangup(tty, "error %d, releasing...\n", retval);
+                tty_debug_hangup(tty, "open error %d, releasing\n", retval);
 
                 tty_unlock(tty); /* need to call tty_release without BTM */
                 tty_release(inode, filp);
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 40964eaf115f..0ea351388724 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -216,7 +216,7 @@ int tty_unthrottle_safe(struct tty_struct *tty)
 
 void tty_wait_until_sent(struct tty_struct *tty, long timeout)
 {
-        tty_debug_wait_until_sent(tty, "\n");
+        tty_debug_wait_until_sent(tty, "wait until sent, timeout=%ld\n", timeout);
 
         if (!timeout)
                 timeout = MAX_SCHEDULE_TIMEOUT;