Skip to contentSkip to conversation

tty: cleanup the panic message

PATCH In review Cong Ding 2 participants 3 messages Jan 12, 2013 TTY layer and serial drivers

lore
Share & tools
lore

Cong Ding

author
#0 lore raw

PATCH 1/2 tty: cleanup the panic message

the "\n" in panic message is excess, so we remove it in tty/pty.c as what it is used in other places.

Signed-off-by Cong Ding <[email protected]>
---
 drivers/tty/pty.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/pty.c +1 -1
index be6a373..64fcbdb 100644
@@ -795,7 +795,7 @@ static void __init unix98_pty_init(void)
 	cdev_init(&ptmx_cdev, &ptmx_fops);
 	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-		panic("Couldn't register /dev/ptmx driver\n");
+		panic("Couldn't register /dev/ptmx driver");
 	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 }
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 tty: cleanup checkpatch warning in pty.c

spaces are used for indent in 3 places of tty/pty.c, we change it to tab.

Signed-off-by Cong Ding <[email protected]>
---
 drivers/tty/pty.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/pty.c +3 -3
index 64fcbdb..358a5fe 100644
@@ -55,9 +55,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
 		set_bit(TTY_OTHER_CLOSED, &tty->flags);
 #ifdef CONFIG_UNIX98_PTYS
 		if (tty->driver == ptm_driver) {
-		        mutex_lock(&devpts_mutex);
+			mutex_lock(&devpts_mutex);
 			devpts_pty_kill(tty->link->driver_data);
-		        mutex_unlock(&devpts_mutex);
+			mutex_unlock(&devpts_mutex);
 		}
 #endif
 		tty_unlock(tty);

@@ -661,7 +661,7 @@ static const struct tty_operations pty_unix98_ops = {
  *	Allocate a unix98 pty master device from the ptmx driver.
  *
  *	Locking: tty_mutex protects the init_dev work. tty->count should
- * 		protect the rest.
+ *		protect the rest.
  *		allocated_ptys_lock handles the list of free pty numbers
  */
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Cong Ding
Quoted 2 lines · Cong Ding

the "\n" in panic message is excess, so we remove it in tty/pty.c as what it is used in other places.

All three are OK. Thanks.

Signature · 2 lines
js
suse labs