Commit 1b7bc6b1 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

tty: use pr_warn_ratelimited() for deprecated serial flags 



Use pr_warn_ratelimited() when warning about deprecated serial flags
instead of open coding.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210407095208.31838-5-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8871de06

drivers/tty/tty_io.c

+6 −12
Original line number Diff line number Diff line
@@ -2626,9 +2626,6 @@ static int tty_tiocgicount(struct tty_struct *tty, void __user *arg) 


static int tty_tiocsserial(struct tty_struct *tty, struct serial_struct __user *ss)

{

	static DEFINE_RATELIMIT_STATE(depr_flags,

			DEFAULT_RATELIMIT_INTERVAL,

			DEFAULT_RATELIMIT_BURST);

	char comm[TASK_COMM_LEN];

	struct serial_struct v;

	int flags;
@@ -2638,8 +2635,8 @@ static int tty_tiocsserial(struct tty_struct *tty, struct serial_struct __user * 


	flags = v.flags & ASYNC_DEPRECATED;



	if (flags && __ratelimit(&depr_flags))

		pr_warn("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",

	if (flags)

		pr_warn_ratelimited("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",

				__func__, get_task_comm(comm, current), flags);

	if (!tty->ops->set_serial)

		return -ENOTTY;
@@ -2841,9 +2838,6 @@ struct serial_struct32 { 
static int compat_tty_tiocsserial(struct tty_struct *tty,

		struct serial_struct32 __user *ss)

{

	static DEFINE_RATELIMIT_STATE(depr_flags,

			DEFAULT_RATELIMIT_INTERVAL,

			DEFAULT_RATELIMIT_BURST);

	char comm[TASK_COMM_LEN];

	struct serial_struct32 v32;

	struct serial_struct v;
@@ -2860,8 +2854,8 @@ static int compat_tty_tiocsserial(struct tty_struct *tty, 


	flags = v.flags & ASYNC_DEPRECATED;



	if (flags && __ratelimit(&depr_flags))

		pr_warn("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",

	if (flags)

		pr_warn_ratelimited("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",

				__func__, get_task_comm(comm, current), flags);

	if (!tty->ops->set_serial)

		return -ENOTTY;