OSDN Git Service

Revert "serial-uartlite: Add get serial id if not provided"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Nov 2019 22:28:40 +0000 (06:28 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Nov 2019 22:28:40 +0000 (06:28 +0800)
This reverts commit 62104b280a5a5d999c562d8e8f4c6c4eb97fb013.

As Johan says, this driver needs a lot more work and these changes are
only going in the wrong direction:
    https://lkml.kernel.org/r/20190523091839.GC568@localhost

Reported-by: Johan Hovold <johan@kernel.org>
Cc: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/uartlite.c

index 2e93af7..7c68937 100644 (file)
@@ -763,13 +763,6 @@ static int ulite_probe(struct platform_device *pdev)
        if (prop)
                id = be32_to_cpup(prop);
 #endif
-       if (id < 0) {
-               /* Look for a serialN alias */
-               id = of_alias_get_id(pdev->dev.of_node, "serial");
-               if (id < 0)
-                       id = 0;
-       }
-
        if (!ulite_uart_driver.state) {
                dev_dbg(&pdev->dev, "uartlite: calling uart_register_driver()\n");
                ret = uart_register_driver(&ulite_uart_driver);