Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89222e62 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: core: Prefer pr_* to printk(*) 



Convert remaining printk() use to pr_*() when tty is unknown or
unsafe to use.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f658dca9

drivers/tty/tty_io.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/tty/tty_ioctl.c

+2 −4
Original line number Diff line number Diff line
@@ -458,10 +458,8 @@ void tty_termios_encode_baud_rate(struct ktermios *termios, 
	if (ifound == -1 && (ibaud != obaud || ibinput))

		termios->c_cflag |= (BOTHER << IBSHIFT);

#else

	if (ifound == -1 || ofound == -1) {

		printk_once(KERN_WARNING "tty: Unable to return correct "

			  "speed data as your architecture needs updating.\n");

	}

	if (ifound == -1 || ofound == -1)

		pr_warn_once("tty: Unable to return correct speed data as your architecture needs updating.\n");

#endif

}

EXPORT_SYMBOL_GPL(tty_termios_encode_baud_rate);