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

Commit 3c76bc5b authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] serial: fix-up schedule_timeout() usage 



Use schedule_timeout_uninterruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a9a3047d

drivers/serial/crisv10.c

+3 −6
Original line number Diff line number Diff line
@@ -4416,10 +4416,8 @@ rs_close(struct tty_struct *tty, struct file * filp) 
	info->event = 0;

	info->tty = 0;

	if (info->blocked_open) {

		if (info->close_delay) {

			set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(info->close_delay);

		}

		if (info->close_delay)

			schedule_timeout_interruptible(info->close_delay);

		wake_up_interruptible(&info->open_wait);

	}

	info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
@@ -4469,8 +4467,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) 
	while (info->xmit.head != info->xmit.tail || /* More in send queue */

	       (*info->ostatusadr & 0x007f) ||  /* more in FIFO */

	       (elapsed_usec < 2*info->char_time_usec)) {

		set_current_state(TASK_INTERRUPTIBLE);

		schedule_timeout(1);

		schedule_timeout_interruptible(1);

		if (signal_pending(current))

			break;

		if (timeout && time_after(jiffies, orig_jiffies + timeout))