]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: bcm63xx: Use platform_get_irq() to get the interrupt
authorLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Fri, 24 Dec 2021 14:29:15 +0000 (14:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Dec 2021 12:26:49 +0000 (13:26 +0100)
platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypasses the hierarchical setup and messes up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq().

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/r/20211224142917.6966-10-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/bcm63xx_uart.c

index 5fb0e84f7fd1926651b8cbc2753d553f81f5c566..6471a54b616b161ac975db8e69185e363e9bc517 100644 (file)
@@ -804,7 +804,7 @@ static struct uart_driver bcm_uart_driver = {
  */
 static int bcm_uart_probe(struct platform_device *pdev)
 {
-       struct resource *res_mem, *res_irq;
+       struct resource *res_mem;
        struct uart_port *port;
        struct clk *clk;
        int ret;
@@ -833,9 +833,10 @@ static int bcm_uart_probe(struct platform_device *pdev)
        if (IS_ERR(port->membase))
                return PTR_ERR(port->membase);
 
-       res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!res_irq)
-               return -ENODEV;
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0)
+               return ret;
+       port->irq = ret;
 
        clk = clk_get(&pdev->dev, "refclk");
        if (IS_ERR(clk) && pdev->dev.of_node)
@@ -845,7 +846,6 @@ static int bcm_uart_probe(struct platform_device *pdev)
                return -ENODEV;
 
        port->iotype = UPIO_MEM;
-       port->irq = res_irq->start;
        port->ops = &bcm_uart_ops;
        port->flags = UPF_BOOT_AUTOCONF;
        port->dev = &pdev->dev;