OSDN Git Service

pinctrl: baytrail: Use platform_get_irq_optional() explicitly
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 14 Apr 2020 16:13:37 +0000 (19:13 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 15 Apr 2020 15:30:39 +0000 (18:30 +0300)
There is no need to repeat functionality of platform_get_irq_optional()
in the driver. Replace it with explicit call to the helper.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
drivers/pinctrl/intel/pinctrl-baytrail.c

index 9b821c9..0ff7c55 100644 (file)
@@ -1506,8 +1506,7 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
 {
        struct platform_device *pdev = to_platform_device(vg->dev);
        struct gpio_chip *gc;
-       struct resource *irq_rc;
-       int ret;
+       int irq, ret;
 
        /* Set up gpio chip */
        vg->chip        = byt_gpio_chip;
@@ -1527,8 +1526,8 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
 #endif
 
        /* set up interrupts  */
-       irq_rc = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (irq_rc && irq_rc->start) {
+       irq = platform_get_irq_optional(pdev, 0);
+       if (irq > 0) {
                struct gpio_irq_chip *girq;
 
                vg->irqchip.name = "BYT-GPIO",
@@ -1548,7 +1547,7 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
                                             sizeof(*girq->parents), GFP_KERNEL);
                if (!girq->parents)
                        return -ENOMEM;
-               girq->parents[0] = (unsigned int)irq_rc->start;
+               girq->parents[0] = irq;
                girq->default_type = IRQ_TYPE_NONE;
                girq->handler = handle_bad_irq;
        }