]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
serial: 8250_ni: Remove unneeded conditionals
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 21 Mar 2025 18:20:15 +0000 (20:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Apr 2025 14:51:19 +0000 (16:51 +0200)
It doesn't matter if the properties are supplied or not in
the struct ni16550_device_info as default in any case is 0.
Hence there is no need to check for them being set.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Reviewed-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Link: https://lore.kernel.org/r/20250321182119.454507-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_ni.c

index 2dc510c0a5ef7412517c1be5705abb103f1e817c..8bb8bb7bb4f2c857d7ce9c4531d20ba313fd164c 100644 (file)
@@ -275,7 +275,7 @@ static int ni16550_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct uart_8250_port uart = {};
        unsigned int txfifosz, rxfifosz;
-       unsigned int prescaler = 0;
+       unsigned int prescaler;
        struct ni16550_data *data;
        const char *portmode;
        bool rs232_property;
@@ -321,8 +321,7 @@ static int ni16550_probe(struct platform_device *pdev)
         * - static declaration in this driver (for older ACPI IDs)
         * - a "clock-frequency" ACPI
         */
-       if (info->uartclk)
-               uart.port.uartclk = info->uartclk;
+       uart.port.uartclk = info->uartclk;
 
        ret = uart_read_port_properties(&uart.port);
        if (ret)
@@ -340,11 +339,9 @@ static int ni16550_probe(struct platform_device *pdev)
                goto err;
        }
 
-       if (info->prescaler)
-               prescaler = info->prescaler;
+       prescaler = info->prescaler;
        device_property_read_u32(dev, "clock-prescaler", &prescaler);
-
-       if (prescaler != 0) {
+       if (prescaler) {
                uart.port.set_mctrl = ni16550_set_mctrl;
                ni16550_config_prescaler(&uart, (u8)prescaler);
        }