Commit 0f3fd9cf authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_pnp: Remove unneeded ->iotype assignment 



If ->iobase is set the default will be UPIO_PORT for ->iotype after
the uart_read_and_validate_port_properties() call. Hence no need
to assign that explicitly. Otherwise it will be UPIO_MEM.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250124161530.398361-7-andriy.shevchenko@linux.intel.com


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

drivers/tty/serial/8250/8250_pnp.c

+0 −10
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
{

	struct uart_8250_port uart, *port;

	int ret, flags = dev_id->driver_data;

	unsigned char iotype;

	long line;



	if (flags & UNKNOWN_DEV) {
@@ -448,14 +447,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
	memset(&uart, 0, sizeof(uart));

	if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {

		uart.port.iobase = pnp_port_start(dev, 2);

		iotype = UPIO_PORT;

	} else if (pnp_port_valid(dev, 0)) {

		uart.port.iobase = pnp_port_start(dev, 0);

		iotype = UPIO_PORT;

	} else if (pnp_mem_valid(dev, 0)) {

		uart.port.mapbase = pnp_mem_start(dev, 0);

		uart.port.mapsize = pnp_mem_len(dev, 0);

		iotype = UPIO_MEM;

		uart.port.flags = UPF_IOREMAP;

	} else

		return -ENODEV;
@@ -471,12 +467,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
	if (ret)

		return ret;



	/*

	 * The previous call may not set iotype correctly when reg-io-width

	 * property is absent and it doesn't support IO port resource.

	 */

	uart.port.iotype = iotype;



	if (flags & CIR_PORT) {

		uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;

		uart.port.type = PORT_8250_CIR;