serial: 8250_uniphier: Switch to use uart_read_port_properties()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 4 Mar 2024 12:27:15 +0000 (14:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Mar 2024 13:38:30 +0000 (13:38 +0000)
Since we have now a common helper to read port properties
use it instead of sparse home grown solution.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Tested-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/20240304123035.758700-15-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_uniphier.c

index 6399a38ecce2ada62168872b33b13ae7c7273b49..670d2ca0f7572948384c67a49855cd96464447c1 100644 (file)
@@ -162,7 +162,6 @@ static int uniphier_uart_probe(struct platform_device *pdev)
        struct uniphier8250_priv *priv;
        struct resource *regs;
        void __iomem *membase;
-       int irq;
        int ret;
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -175,23 +174,12 @@ static int uniphier_uart_probe(struct platform_device *pdev)
        if (!membase)
                return -ENOMEM;
 
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               return irq;
-
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
        memset(&up, 0, sizeof(up));
 
-       ret = of_alias_get_id(dev->of_node, "serial");
-       if (ret < 0) {
-               dev_err(dev, "failed to get alias id\n");
-               return ret;
-       }
-       up.port.line = ret;
-
        priv->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(priv->clk)) {
                dev_err(dev, "failed to get clock\n");
@@ -211,7 +199,10 @@ static int uniphier_uart_probe(struct platform_device *pdev)
        up.port.mapbase = regs->start;
        up.port.mapsize = resource_size(regs);
        up.port.membase = membase;
-       up.port.irq = irq;
+
+       ret = uart_read_port_properties(&up.port);
+       if (ret)
+               return ret;
 
        up.port.type = PORT_16550A;
        up.port.iotype = UPIO_MEM32;