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

tty/serial: clean up uart_match_port 



* make parameters const (as they are only read)
* return bool (as comparison results are returned)
* add \n before final return

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210519072153.3859-1-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bc2bd5a

drivers/tty/serial/serial_core.c

+9 −7
Original line number Diff line number Diff line
@@ -3027,26 +3027,28 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) 
/*

 *	Are the two ports equivalent?

 */

int uart_match_port(struct uart_port *port1, struct uart_port *port2)

bool uart_match_port(const struct uart_port *port1,

		const struct uart_port *port2)

{

	if (port1->iotype != port2->iotype)

		return 0;

		return false;



	switch (port1->iotype) {

	case UPIO_PORT:

		return (port1->iobase == port2->iobase);

		return port1->iobase == port2->iobase;

	case UPIO_HUB6:

		return (port1->iobase == port2->iobase) &&

		       (port1->hub6   == port2->hub6);

		return port1->iobase == port2->iobase &&

		       port1->hub6   == port2->hub6;

	case UPIO_MEM:

	case UPIO_MEM16:

	case UPIO_MEM32:

	case UPIO_MEM32BE:

	case UPIO_AU:

	case UPIO_TSI:

		return (port1->mapbase == port2->mapbase);

		return port1->mapbase == port2->mapbase;

	}

	return 0;



	return false;

}

EXPORT_SYMBOL(uart_match_port);

include/linux/serial_core.h

+2 −1
Original line number Diff line number Diff line
@@ -408,7 +408,8 @@ int uart_register_driver(struct uart_driver *uart); 
void uart_unregister_driver(struct uart_driver *uart);

int uart_add_one_port(struct uart_driver *reg, struct uart_port *port);

int uart_remove_one_port(struct uart_driver *reg, struct uart_port *port);

int uart_match_port(struct uart_port *port1, struct uart_port *port2);

bool uart_match_port(const struct uart_port *port1,

		const struct uart_port *port2);



/*

 * Power Management