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

Commit 6137b7a6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: stop defining STD_COM_FLAGS in drivers 



STD_COM_FLAGS is mostly a bad name for what the drivers thinks it is.
Stop using it and pass the flags directly.

cyclades defines it as 0, so we do not assign anything to freshly
tty_port_init'ed structure.

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

arch/xtensa/platforms/xt2000/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ void platform_heartbeat(void) 
}



//#define RS_TABLE_SIZE 2

//#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF|UPF_SKIP_TEST)



#define _SERIAL_PORT(_base,_irq)					\

{									\

drivers/tty/cyclades.c

+0 −3
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static void cy_send_xchar(struct tty_struct *tty, char ch); 
#define	SERIAL_XMIT_SIZE	(min(PAGE_SIZE, 4096))

#endif



#define STD_COM_FLAGS (0)



/* firmware stuff */

#define ZL_MAX_BLOCKS	16

#define DRIVER_VERSION	0x02010203
@@ -3083,7 +3081,6 @@ static int cy_init_card(struct cyclades_card *cinfo) 


		info->port.closing_wait = CLOSING_WAIT_DELAY;

		info->port.close_delay = 5 * HZ / 10;

		info->port.flags = STD_COM_FLAGS;

		init_completion(&info->shutdown_wait);



		if (cy_is_Z(cinfo)) {

drivers/tty/serial/m32r_sio.c

+1 −4
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ 


#define PASS_LIMIT	256



/* Standard COM flags */

#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)



static const struct {

	unsigned int port;

	unsigned int irq;
@@ -892,7 +889,7 @@ static void __init m32r_sio_init_ports(void) 
		up->port.iobase   = old_serial_port[i].port;

		up->port.irq      = irq_canonicalize(old_serial_port[i].irq);

		up->port.uartclk  = BAUD_RATE * 16;

		up->port.flags    = STD_COM_FLAGS;

		up->port.flags    = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;

		up->port.membase  = 0;

		up->port.iotype   = 0;

		up->port.regshift = 0;