tty: change tty_write_lock()'s ndelay parameter to bool

It's a yes-no parameter, so convert it to bool to be obvious.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-6-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/tty.h b/drivers/tty/tty.h
index 89769a1f1f9725f278f10a07ea43dcc9d8ebc7f4..2751ac3946e71703d86584e67634c8cd652748f0 100644 (file)
--- a/drivers/tty/tty.h
+++ b/drivers/tty/tty.h
@@ -63,7 +63,7 @@ int tty_check_change(struct tty_struct *tty);
 void __stop_tty(struct tty_struct *tty);
 void __start_tty(struct tty_struct *tty);
 void tty_write_unlock(struct tty_struct *tty);
-int tty_write_lock(struct tty_struct *tty, int ndelay);
+int tty_write_lock(struct tty_struct *tty, bool ndelay);
 void tty_vhangup_session(struct tty_struct *tty);
 void tty_open_proc_set_tty(struct file *filp, struct tty_struct *tty);
 int tty_signal_session_leader(struct tty_struct *tty, int exit_session);

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index eb4e2e0e300de7bb1924a964c80449cd155d9cab..54036a20a102aabae9bb79b64269f2a18109f2a7 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -946,7 +946,7 @@ void tty_write_unlock(struct tty_struct *tty)
        wake_up_interruptible_poll(&tty->write_wait, EPOLLOUT);
 }
 
-int tty_write_lock(struct tty_struct *tty, int ndelay)
+int tty_write_lock(struct tty_struct *tty, bool ndelay)
 {
        if (!mutex_trylock(&tty->atomic_write_lock)) {
                if (ndelay)
@@ -1160,7 +1160,7 @@ int tty_send_xchar(struct tty_struct *tty, char ch)
                return 0;
        }
 
-       if (tty_write_lock(tty, 0) < 0)
+       if (tty_write_lock(tty, false) < 0)
                return -ERESTARTSYS;
 
        down_read(&tty->termios_rwsem);
@@ -2486,7 +2486,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration)
                retval = tty->ops->break_ctl(tty, duration);
        else {
                /* Do the work ourselves */
-               if (tty_write_lock(tty, 0) < 0)
+               if (tty_write_lock(tty, false) < 0)
                        return -EINTR;
                retval = tty->ops->break_ctl(tty, -1);
                if (retval)

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 2e88b414cf9533db88abaf3316b1dab070d8b1a3..e3e1318f53fd08d962ef894b0e4fc5285ca7297f 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -507,7 +507,7 @@ retry_write_wait:
                if (retval < 0)
                        return retval;
 
-               if (tty_write_lock(tty, 0) < 0)
+               if (tty_write_lock(tty, false) < 0)
                        goto retry_write_wait;
 
                /* Racing writer? */