summaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-11-08 19:01:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-14 04:59:48 +0100
commit89222e62662237faee90cd8486d23350f26b181d (patch)
tree4c57f9bb2b4c2a8543ba95ec6ad444ac371e8613 /drivers/tty/tty_io.c
parenttty: Remove unset_locked_termios() error message (diff)
downloadlinux-89222e62662237faee90cd8486d23350f26b181d.tar.xz
linux-89222e62662237faee90cd8486d23350f26b181d.zip
tty: core: Prefer pr_* to printk(*)
Convert remaining printk() use to pr_*() when tty is unknown or unsafe to use. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 86e379a38219..d9df15f1086b 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -268,14 +268,12 @@ static int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
{
#ifdef TTY_PARANOIA_CHECK
if (!tty) {
- printk(KERN_WARNING
- "null TTY for (%d:%d) in %s\n",
+ pr_warn("(%d:%d): %s: NULL tty\n",
imajor(inode), iminor(inode), routine);
return 1;
}
if (tty->magic != TTY_MAGIC) {
- printk(KERN_WARNING
- "bad magic number for tty struct (%d:%d) in %s\n",
+ pr_warn("(%d:%d): %s: bad magic number\n",
imajor(inode), iminor(inode), routine);
return 1;
}