serial: 8250_ni: Switch to use dev_err_probe()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 21 Mar 2025 18:20:17 +0000 (20:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Apr 2025 14:51:20 +0000 (16:51 +0200)
Switch to use dev_err_probe() to simplify the error path and
unify a message template.

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-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_ni.c

index 15bee1b7dc2a30cd96e7a6e46335d5e3cc965d17..c66bfc56838e02fc7dbb956941d0fd9263158004 100644 (file)
@@ -333,11 +333,8 @@ static int ni16550_probe(struct platform_device *pdev)
                        uart.port.uartclk = clk_get_rate(data->clk);
        }
 
-       if (!uart.port.uartclk) {
-               dev_err(dev, "unable to determine clock frequency!\n");
-               ret = -ENODEV;
-               goto err;
-       }
+       if (!uart.port.uartclk)
+               return dev_err_probe(dev, -ENODEV, "unable to determine clock frequency!\n");
 
        prescaler = info->prescaler;
        device_property_read_u32(dev, "clock-prescaler", &prescaler);
@@ -381,14 +378,11 @@ static int ni16550_probe(struct platform_device *pdev)
 
        ret = serial8250_register_8250_port(&uart);
        if (ret < 0)
-               goto err;
+               return ret;
        data->line = ret;
 
        platform_set_drvdata(pdev, data);
        return 0;
-
-err:
-       return ret;
 }
 
 static void ni16550_remove(struct platform_device *pdev)