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

TTY: serial/m32r_sio, simplify old_serial_port 



The only variables in old_serial_port are port and irq. So make
old_serial_port contain only those two and move the initialization of
the rest to the place where old_serial_port is actually read.

Also get rid of SERIAL_PORT_DFNS. It is ugly and having the
initializer where it belongs makes more sense. Finally, use already
defined UART_NR in the loop.

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

drivers/tty/serial/m32r_sio.c

+15 −42
Original line number Diff line number Diff line
@@ -66,48 +66,22 @@ 


#define PASS_LIMIT	256



#define BASE_BAUD	115200



/* Standard COM flags */

#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)



/*

 * SERIAL_PORT_DFNS tells us about built-in ports that have no

 * standard enumeration mechanism.   Platforms that can find all

 * serial ports via mechanisms like ACPI or PCI need not supply it.

 */

#if defined(CONFIG_PLAT_USRV)



#define SERIAL_PORT_DFNS						\

       /* UART  CLK     PORT   IRQ            FLAGS */			\

	{ 0, BASE_BAUD, 0x3F8, PLD_IRQ_UART0, STD_COM_FLAGS }, /* ttyS0 */ \

	{ 0, BASE_BAUD, 0x2F8, PLD_IRQ_UART1, STD_COM_FLAGS }, /* ttyS1 */



#else /* !CONFIG_PLAT_USRV */



#if defined(CONFIG_SERIAL_M32R_PLDSIO)

#define SERIAL_PORT_DFNS						\

	{ 0, BASE_BAUD, ((unsigned long)PLD_ESIO0CR), PLD_IRQ_SIO0_RCV,	\

	  STD_COM_FLAGS }, /* ttyS0 */

#else

#define SERIAL_PORT_DFNS						\

	{ 0, BASE_BAUD, M32R_SIO_OFFSET, M32R_IRQ_SIO0_R,		\

	  STD_COM_FLAGS }, /* ttyS0 */

#endif



#endif /* !CONFIG_PLAT_USRV */



static const struct {

	unsigned int uart;

	unsigned int baud_base;

	unsigned int port;

	unsigned int irq;

	unsigned int flags;

	unsigned char io_type;

	unsigned char __iomem *iomem_base;

	unsigned short iomem_reg_shift;

} old_serial_port[] = {

	SERIAL_PORT_DFNS

#if defined(CONFIG_PLAT_USRV)

	/* PORT  IRQ            FLAGS */

	{ 0x3F8, PLD_IRQ_UART0 }, /* ttyS0 */

	{ 0x2F8, PLD_IRQ_UART1 }, /* ttyS1 */

#elif defined(CONFIG_SERIAL_M32R_PLDSIO)

	{ ((unsigned long)PLD_ESIO0CR), PLD_IRQ_SIO0_RCV }, /* ttyS0 */

#else

	{ M32R_SIO_OFFSET, M32R_IRQ_SIO0_R }, /* ttyS0 */

#endif

};



#define UART_NR	ARRAY_SIZE(old_serial_port)
@@ -959,15 +933,14 @@ static void __init m32r_sio_init_ports(void) 
		return;

	first = 0;



	for (i = 0, up = m32r_sio_ports; i < ARRAY_SIZE(old_serial_port);

	     i++, up++) {

	for (i = 0, up = m32r_sio_ports; i < UART_NR; i++, up++) {

		up->port.iobase   = old_serial_port[i].port;

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

		up->port.uartclk  = old_serial_port[i].baud_base * 16;

		up->port.flags    = old_serial_port[i].flags;

		up->port.membase  = old_serial_port[i].iomem_base;

		up->port.iotype   = old_serial_port[i].io_type;

		up->port.regshift = old_serial_port[i].iomem_reg_shift;

		up->port.uartclk  = BAUD_RATE * 16;

		up->port.flags    = STD_COM_FLAGS;

		up->port.membase  = 0;

		up->port.iotype   = 0;

		up->port.regshift = 0;

		up->port.ops      = &m32r_sio_pops;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE