tty: Remove warning in tty_lock_slave()

PATCH New Peter Hurley 1 participant 1 message Dec 30, 2014 TTY layer and serial drivers

Share & tools

Peter Hurley

author

2014-12-30 12:11 UTC #0 lore raw

PATCH 1/1 tty: Remove warning in tty_lock_slave()

Commit 2aff5e2bc62db43e05c814461a08aff0fc2b7fe5 ('tty: Change tty lock order to master->slave') added a warning which is broken and unnecessary now that the tty lock has fixed lock subclasses, added in commit 2febdb632bb96235b94b8fccaf882a78f8f4b2bb ('tty: Preset lock subclass for nested tty locks').

Reported-by Dan Carpenter <[email protected]>

Signed-off-by Peter Hurley <[email protected]>

---
 drivers/tty/tty_mutex.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

drivers/tty/tty_mutex.c +1 -5

index 4486741..a872389 100644
@@ -46,12 +46,8 @@ EXPORT_SYMBOL(tty_unlock);
 
 void __lockfunc tty_lock_slave(struct tty_struct *tty)
 {
-	if (tty && tty != tty->link) {
-		WARN_ON(!mutex_is_locked(&tty->link->legacy_mutex) ||
-			!tty->driver->type == TTY_DRIVER_TYPE_PTY ||
-			!tty->driver->type == PTY_TYPE_SLAVE);
+	if (tty && tty != tty->link)
 		tty_lock(tty);
-	}
 }
 
 void __lockfunc tty_unlock_slave(struct tty_struct *tty)

Signature · 1 line

2.2.1