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

Commit 6865ff22 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: do not warn about setting speed via SPD_* 



The warning is there since 2.1.69 and we have not seen anybody
reporting it in the past decade. Remove the warning now.

tty_get_baud_rate can now be inline. This gives us one less
EXPORT_SYMBOL.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 049b539b

drivers/tty/tty_ioctl.c

+0 −28
Original line number Diff line number Diff line
@@ -478,34 +478,6 @@ void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud) 
}

EXPORT_SYMBOL_GPL(tty_encode_baud_rate);



/**

 *	tty_get_baud_rate	-	get tty bit rates

 *	@tty: tty to query

 *

 *	Returns the baud rate as an integer for this terminal. The

 *	termios lock must be held by the caller and the terminal bit

 *	flags may be updated.

 *

 *	Locking: none

 */



speed_t tty_get_baud_rate(struct tty_struct *tty)

{

	speed_t baud = tty_termios_baud_rate(&tty->termios);



	if (baud == 38400 && tty->alt_speed) {

		if (!tty->warned) {

			printk(KERN_WARNING "Use of setserial/setrocket to "

					    "set SPD_* flags is deprecated\n");

			tty->warned = 1;

		}

		baud = tty->alt_speed;

	}



	return baud;

}

EXPORT_SYMBOL(tty_get_baud_rate);



/**

 *	tty_termios_copy_hw	-	copy hardware settings

 *	@new: New termios

include/linux/tty.h

+16 −2
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct tty_struct { 
	int count;

	struct winsize winsize;		/* termios mutex */

	unsigned char stopped:1, hw_stopped:1, flow_stopped:1, packet:1;

	unsigned char warned:1;

	unsigned char ctrl_status;	/* ctrl_lock */

	unsigned int receive_room;	/* Bytes free for queue */

	int flow_change;
@@ -437,13 +436,28 @@ extern void tty_flush_to_ldisc(struct tty_struct *tty); 
extern void tty_buffer_free_all(struct tty_port *port);

extern void tty_buffer_flush(struct tty_struct *tty);

extern void tty_buffer_init(struct tty_port *port);

extern speed_t tty_get_baud_rate(struct tty_struct *tty);

extern speed_t tty_termios_baud_rate(struct ktermios *termios);

extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);

extern void tty_termios_encode_baud_rate(struct ktermios *termios,

						speed_t ibaud, speed_t obaud);

extern void tty_encode_baud_rate(struct tty_struct *tty,

						speed_t ibaud, speed_t obaud);



/**

 *	tty_get_baud_rate	-	get tty bit rates

 *	@tty: tty to query

 *

 *	Returns the baud rate as an integer for this terminal. The

 *	termios lock must be held by the caller and the terminal bit

 *	flags may be updated.

 *

 *	Locking: none

 */

static inline speed_t tty_get_baud_rate(struct tty_struct *tty)

{

	return tty_termios_baud_rate(&tty->termios);

}



extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);

extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);

extern int tty_set_termios(struct tty_struct *tty, struct ktermios *kt);