niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

serial: 8250_pnp: Remove unneeded ->iotype assignment

Browse source 
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250124161530.398361-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2025-01-24 18:10:51 +02:00 • committed by Greg Kroah-Hartman
parent 34bbb5d513
commit 0f3fd9cf64
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/tty/serial/8250/8250_pnp.c
View file

@ -436,7 +436,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
{ {
struct uart_8250_port uart, *port; struct uart_8250_port uart, *port;
int ret, flags = dev_id->driver_data; int ret, flags = dev_id->driver_data;
unsigned char iotype;
long line; long line;
if (flags & UNKNOWN_DEV) { 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)); memset(&uart, 0, sizeof(uart));
if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) { if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {
uart.port.iobase = pnp_port_start(dev, 2); uart.port.iobase = pnp_port_start(dev, 2);
iotype = UPIO_PORT;
} else if (pnp_port_valid(dev, 0)) { } else if (pnp_port_valid(dev, 0)) {
uart.port.iobase = pnp_port_start(dev, 0); uart.port.iobase = pnp_port_start(dev, 0);
iotype = UPIO_PORT;
} else if (pnp_mem_valid(dev, 0)) { } else if (pnp_mem_valid(dev, 0)) {
uart.port.mapbase = pnp_mem_start(dev, 0); uart.port.mapbase = pnp_mem_start(dev, 0);
uart.port.mapsize = pnp_mem_len(dev, 0); uart.port.mapsize = pnp_mem_len(dev, 0);
iotype = UPIO_MEM;
uart.port.flags = UPF_IOREMAP; uart.port.flags = UPF_IOREMAP;
} else } else
return -ENODEV; return -ENODEV;
@ -471,12 +467,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
if (ret) if (ret)
return 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) { if (flags & CIR_PORT) {
uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE; uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;
uart.port.type = PORT_8250_CIR; uart.port.type = PORT_8250_CIR;