Commit 39c2e60f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty: add throttle/unthrottle helpers 



Something Arjan suggested which allows us to clean up the code nicely

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8cd64518

drivers/bluetooth/hci_ldisc.c

+1 −3
Original line number Diff line number Diff line
@@ -370,9 +370,7 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *f 
	hu->hdev->stat.byte_rx += count;

	spin_unlock(&hu->rx_lock);



	if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&

					tty->ops->unthrottle)

		tty->ops->unthrottle(tty);

	tty_unthrottle(tty);

}



static int hci_uart_register_dev(struct hci_uart *hu)

drivers/char/n_tty.c

+4 −10
Original line number Diff line number Diff line
@@ -147,10 +147,8 @@ static void put_tty_queue(unsigned char c, struct tty_struct *tty) 


static void check_unthrottle(struct tty_struct *tty)

{

	if (tty->count &&

	    test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&

	    tty->ops->unthrottle)

		tty->ops->unthrottle(tty);

	if (tty->count)

		tty_unthrottle(tty);

}



/**
@@ -982,12 +980,8 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
	 * mode.  We don't want to throttle the driver if we're in

	 * canonical mode and don't have a newline yet!

	 */

	if (tty->receive_room < TTY_THRESHOLD_THROTTLE) {

		/* check TTY_THROTTLED first so it indicates our state */

		if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&

		    tty->ops->throttle)

			tty->ops->throttle(tty);

	}

	if (tty->receive_room < TTY_THRESHOLD_THROTTLE)

		tty_throttle(tty);

}



int is_ignored(int sig)

drivers/char/tty_ioctl.c

+16 −0
Original line number Diff line number Diff line
@@ -67,6 +67,22 @@ void tty_driver_flush_buffer(struct tty_struct *tty) 


EXPORT_SYMBOL(tty_driver_flush_buffer);



void tty_throttle(struct tty_struct *tty)

{

	/* check TTY_THROTTLED first so it indicates our state */

	if (!test_and_set_bit(TTY_THROTTLED, &tty->flags) &&

	    tty->ops->throttle)

		tty->ops->throttle(tty);

}

EXPORT_SYMBOL(tty_throttle);



void tty_unthrottle(struct tty_struct *tty)

{

	if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&

	    tty->ops->unthrottle)

		tty->ops->unthrottle(tty);

}

EXPORT_SYMBOL(tty_unthrottle);



/**

 *	tty_wait_until_sent	-	wait for I/O to finish

drivers/net/hamradio/6pack.c

+1 −3
Original line number Diff line number Diff line
@@ -491,9 +491,7 @@ static void sixpack_receive_buf(struct tty_struct *tty, 
	sixpack_decode(sp, buf, count1);



	sp_put(sp);

	if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)

	    && tty->ops->unthrottle)

		tty->ops->unthrottle(tty);

	tty_unthrottle(tty);

}



/*

drivers/net/hamradio/mkiss.c

+1 −3
Original line number Diff line number Diff line
@@ -936,9 +936,7 @@ static void mkiss_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
	}



	mkiss_put(ax);

	if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)

	    && tty->ops->unthrottle)

		tty->ops->unthrottle(tty);

	tty_unthrottle(tty);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE