mxser: use msleep_interruptible() in mxser_wait_until_sent()
authorJiri Slaby <jslaby@suse.cz>
Thu, 18 Nov 2021 07:31:18 +0000 (08:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Nov 2021 17:33:22 +0000 (18:33 +0100)
Instead of schedule_timeout_interruptible(), because:
1) we don't have to bother with the task state, and
2) msleep* guarantees to sleep that time (if not interrupted).

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118073125.12283-13-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/mxser.c

index fb26670b5a0bf94942c0f654364d90bac8dcf766..b3ae3b105af06139b222d5cb282d45358f1378eb 100644 (file)
@@ -1443,6 +1443,9 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
                char_time = 1;
        if (timeout && timeout < char_time)
                char_time = timeout;
+
+       char_time = jiffies_to_msecs(char_time);
+
        /*
         * If the transmitter hasn't cleared in twice the approximate
         * amount of time to send the entire FIFO, it probably won't
@@ -1456,13 +1459,12 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
                timeout = 2 * info->timeout;
 
        while (mxser_tx_empty(info)) {
-               schedule_timeout_interruptible(char_time);
+               msleep_interruptible(char_time);
                if (signal_pending(current))
                        break;
                if (timeout && time_after(jiffies, orig_jiffies + timeout))
                        break;
        }
-       set_current_state(TASK_RUNNING);
 }
 
 /*