]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tty: serial: qcom_geni_serial: Drop useless check for dev.of_node
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 23 Aug 2018 21:30:27 +0000 (23:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Sep 2018 14:07:24 +0000 (16:07 +0200)
With gcc 4.1.2:

    drivers/tty/serial/qcom_geni_serial.c: In function ‘qcom_geni_serial_probe’:
    drivers/tty/serial/qcom_geni_serial.c:1261: warning: ‘drv’ may be used uninitialized in this function

Indeed, if dev.of_node is NULL, drv will be used uninitialized, and
dereferenced in uart_add_one_port().  However, as this driver supports
DT only, dev.of_node will always be valid.

Hence remove the useless check for dev.of_node, killing the warning as a
side effect.

Fixes: 8a8a66a1a18a1dbd ("tty: serial: qcom_geni_serial: Add support for flow control")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/qcom_geni_serial.c

index 29ec343872466e49a310ad740b67fe2f9a9603d0..1cfbb6745a8cc7d019a810720a9fb38b4a3cc6ba 100644 (file)
@@ -1263,14 +1263,12 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
        if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart"))
                console = true;
 
-       if (pdev->dev.of_node) {
-               if (console) {
-                       drv = &qcom_geni_console_driver;
-                       line = of_alias_get_id(pdev->dev.of_node, "serial");
-               } else {
-                       drv = &qcom_geni_uart_driver;
-                       line = of_alias_get_id(pdev->dev.of_node, "hsuart");
-               }
+       if (console) {
+               drv = &qcom_geni_console_driver;
+               line = of_alias_get_id(pdev->dev.of_node, "serial");
+       } else {
+               drv = &qcom_geni_uart_driver;
+               line = of_alias_get_id(pdev->dev.of_node, "hsuart");
        }
 
        port = get_port_from_line(line, console);