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

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

TTY: serial/bfin_uart, unbreak build with KGDB enabled 



There are no (and never were any) kgdb fields in uart_ops. Setting
them produces a build error:
drivers/tty/serial/bfin_uart.c:1054:2: error: unknown field 'kgdboc_port_startup' specified in initializer
drivers/tty/serial/bfin_uart.c:1054:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/bfin_uart.c:1054:2: warning: (near initialization for 'bfin_serial_pops.ioctl') [enabled by default]
drivers/tty/serial/bfin_uart.c:1055:2: error: unknown field 'kgdboc_port_shutdown' specified in initializer
drivers/tty/serial/bfin_uart.c:1055:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/bfin_uart.c:1055:2: warning: (near initialization for 'bfin_serial_pops.poll_init') [enabled by default]

Remove them.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Acked-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa27a094

drivers/tty/serial/bfin_uart.c

+0 −23
Original line number Diff line number Diff line
@@ -1011,24 +1011,6 @@ static int bfin_serial_poll_get_char(struct uart_port *port) 
}

#endif



#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \

	defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)

static void bfin_kgdboc_port_shutdown(struct uart_port *port)

{

	if (kgdboc_break_enabled) {

		kgdboc_break_enabled = 0;

		bfin_serial_shutdown(port);

	}

}



static int bfin_kgdboc_port_startup(struct uart_port *port)

{

	kgdboc_port_line = port->line;

	kgdboc_break_enabled = !bfin_serial_startup(port);

	return 0;

}

#endif



static struct uart_ops bfin_serial_pops = {

	.tx_empty	= bfin_serial_tx_empty,

	.set_mctrl	= bfin_serial_set_mctrl,
@@ -1047,11 +1029,6 @@ static struct uart_ops bfin_serial_pops = { 
	.request_port	= bfin_serial_request_port,

	.config_port	= bfin_serial_config_port,

	.verify_port	= bfin_serial_verify_port,

#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \

	defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)

	.kgdboc_port_startup	= bfin_kgdboc_port_startup,

	.kgdboc_port_shutdown	= bfin_kgdboc_port_shutdown,

#endif

#ifdef CONFIG_CONSOLE_POLL

	.poll_put_char	= bfin_serial_poll_put_char,

	.poll_get_char	= bfin_serial_poll_get_char,