pinctrl: baytrail: Group GPIO IRQ chip initialization
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 24 Oct 2019 14:33:43 +0000 (17:33 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 9 Dec 2019 11:04:12 +0000 (13:04 +0200)
After commit 5ea422750a9f ("pinctrl: baytrail: Pass irqchip when
adding gpiochip") the GPIO IRQ chip structure is being initialized
under conditional when IRQ resource has been discovered. But that
commit left aside the assignment of ->init_valid_mask() callback
that is done unconditionally.

For sake of consistency and preventing some garbage in GPIO IRQ chip
structure group initialization together.

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 72ffd19448e50ca3654d8ff431147a433406fc18..d829843314ba2c9cf9d9bddb4782c54570b5a521 100644 (file)
@@ -1529,7 +1529,6 @@ static int byt_gpio_probe(struct byt_gpio *vg)
        gc->add_pin_ranges = byt_gpio_add_pin_ranges;
        gc->parent      = &vg->pdev->dev;
        gc->ngpio       = vg->soc_data->npins;
-       gc->irq.init_valid_mask = byt_init_irq_valid_mask;
 
 #ifdef CONFIG_PM_SLEEP
        vg->saved_context = devm_kcalloc(&vg->pdev->dev, gc->ngpio,
@@ -1553,6 +1552,7 @@ static int byt_gpio_probe(struct byt_gpio *vg)
                girq = &gc->irq;
                girq->chip = &vg->irqchip;
                girq->init_hw = byt_gpio_irq_init_hw;
+               girq->init_valid_mask = byt_init_irq_valid_mask;
                girq->parent_handler = byt_gpio_irq_handler;
                girq->num_parents = 1;
                girq->parents = devm_kcalloc(&vg->pdev->dev, girq->num_parents,