]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
serial: 8250_platform: Remove unneeded ->iotype assignment
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 24 Jan 2025 16:10:50 +0000 (18:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Feb 2025 13:44:52 +0000 (14:44 +0100)
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-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_platform.c

index 8bdc1879d952be58dfd0095a85a25d9d17ae9602..c0343bfb80647d1308f7a635be1eb08792beac65 100644 (file)
@@ -112,7 +112,6 @@ static int serial8250_probe_acpi(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct uart_8250_port uart = { };
        struct resource *regs;
-       unsigned char iotype;
        int ret, line;
 
        regs = platform_get_mem_or_io(pdev, 0);
@@ -122,13 +121,11 @@ static int serial8250_probe_acpi(struct platform_device *pdev)
        switch (resource_type(regs)) {
        case IORESOURCE_IO:
                uart.port.iobase = regs->start;
-               iotype = UPIO_PORT;
                break;
        case IORESOURCE_MEM:
                uart.port.mapbase = regs->start;
                uart.port.mapsize = resource_size(regs);
                uart.port.flags = UPF_IOREMAP;
-               iotype = UPIO_MEM;
                break;
        default:
                return -EINVAL;
@@ -147,12 +144,6 @@ static int serial8250_probe_acpi(struct platform_device *pdev)
        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;
-
        line = serial8250_register_8250_port(&uart);
        if (line < 0)
                return line;