gpio: em: Use platform_get_irq() to obtain interrupts

Use the platform_get_irq() helper instead of handling resources
directly.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index adc281d..17a243c 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -269,13 +269,12 @@ static void em_gio_irq_domain_remove(void *data)
 static int em_gio_probe(struct platform_device *pdev)
 {
        struct em_gio_priv *p;
-       struct resource *irq[2];
        struct gpio_chip *gpio_chip;
        struct irq_chip *irq_chip;
        struct device *dev = &pdev->dev;
        const char *name = dev_name(dev);
        unsigned int ngpios;
-       int ret;
+       int irq[2], ret;
 
        p = devm_kzalloc(dev, sizeof(*p), GFP_KERNEL);
        if (!p)
@@ -285,13 +284,13 @@ static int em_gio_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, p);
        spin_lock_init(&p->sense_lock);
 
-       irq[0] = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       irq[1] = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
+       irq[0] = platform_get_irq(pdev, 0);
+       if (irq[0] < 0)
+               return irq[0];
 
-       if (!irq[0] || !irq[1]) {
-               dev_err(dev, "missing IRQ or IOMEM\n");
-               return -EINVAL;
-       }
+       irq[1] = platform_get_irq(pdev, 1);
+       if (irq[1] < 0)
+               return irq[1];
 
        p->base0 = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(p->base0))
@@ -342,14 +341,12 @@ static int em_gio_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       if (devm_request_irq(dev, irq[0]->start,
-                            em_gio_irq_handler, 0, name, p)) {
+       if (devm_request_irq(dev, irq[0], em_gio_irq_handler, 0, name, p)) {
                dev_err(dev, "failed to request low IRQ\n");
                return -ENOENT;
        }
 
-       if (devm_request_irq(dev, irq[1]->start,
-                            em_gio_irq_handler, 0, name, p)) {
+       if (devm_request_irq(dev, irq[1], em_gio_irq_handler, 0, name, p)) {
                dev_err(dev, "failed to request high IRQ\n");
                return -ENOENT;
        }