From: Jiri Slaby (SUSE) Date: Mon, 17 Mar 2025 07:00:21 +0000 (+0100) Subject: tty: n_tty: simplify process_output() X-Git-Tag: v6.15-rc1~47^2~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdfa49a8c96500ef9e1fe1cd2e68c8fd71d8b53a;p=thirdparty%2Fkernel%2Flinux.git tty: n_tty: simplify process_output() Using guard(mutex), the function can be written in a much more efficient way. Signed-off-by: Jiri Slaby (SUSE) Link: https://lore.kernel.org/r/20250317070046.24386-7-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 765d24268d75c..df52aae5f71ae 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -488,19 +488,13 @@ static int do_output_char(u8 c, struct tty_struct *tty, int space) static int process_output(u8 c, struct tty_struct *tty) { struct n_tty_data *ldata = tty->disc_data; - unsigned int space; - int retval; - mutex_lock(&ldata->output_lock); + guard(mutex)(&ldata->output_lock); - space = tty_write_room(tty); - retval = do_output_char(c, tty, space); - - mutex_unlock(&ldata->output_lock); - if (retval < 0) + if (do_output_char(c, tty, tty_write_room(tty)) < 0) return -1; - else - return 0; + + return 0; } /**