tty: goldfish: Use platform_get_irq() to get the interrupt

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().

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/r/20211224153753.22210-1-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index c01cd36..5ed19a9 100644 (file)
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -298,7 +298,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
        struct resource *r;
        struct device *ttydev;
        void __iomem *base;
-       u32 irq;
+       int irq;
        unsigned int line;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -313,14 +313,12 @@ static int goldfish_tty_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!r) {
-               pr_err("goldfish_tty: No IRQ resource available!\n");
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0) {
+               ret = irq;
                goto err_unmap;
        }
 
-       irq = r->start;
-
        mutex_lock(&goldfish_tty_lock);
 
        if (pdev->id == PLATFORM_DEVID_NONE)