| Message ID | 20191009165056.76580-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] gpio: merrifield: Restore use of irq_base | expand |
Op 09-10-19 om 18:50 schreef Andy Shevchenko: > During conversion to internal IRQ chip initialization the commit > 8f86a5b4ad67 ("gpio: merrifield: Pass irqchip when adding gpiochip") > lost the irq_base assignment. > > drivers/gpio/gpio-merrifield.c: In function ‘mrfld_gpio_probe’: > drivers/gpio/gpio-merrifield.c:405:17: warning: variable ‘irq_base’ set but not used [-Wunused-but-set-variable] > > Assign the girq->first to it. > > Fixes: 8f86a5b4ad67 ("gpio: merrifield: Pass irqchip when adding gpiochip") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Fixes boot when applied 5.4-rc2 Tested-by: Ferry Toth <fntoth@gmail.com> > --- > drivers/gpio/gpio-merrifield.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c > index 4f27ddfe1e2f..9596024c9161 100644 > --- a/drivers/gpio/gpio-merrifield.c > +++ b/drivers/gpio/gpio-merrifield.c > @@ -455,6 +455,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id > if (!girq->parents) > return -ENOMEM; > girq->parents[0] = pdev->irq; > + girq->first = irq_base; > girq->default_type = IRQ_TYPE_NONE; > girq->handler = handle_bad_irq; > >
diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index 4f27ddfe1e2f..9596024c9161 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -455,6 +455,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id if (!girq->parents) return -ENOMEM; girq->parents[0] = pdev->irq; + girq->first = irq_base; girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_bad_irq;
During conversion to internal IRQ chip initialization the commit 8f86a5b4ad67 ("gpio: merrifield: Pass irqchip when adding gpiochip") lost the irq_base assignment. drivers/gpio/gpio-merrifield.c: In function ‘mrfld_gpio_probe’: drivers/gpio/gpio-merrifield.c:405:17: warning: variable ‘irq_base’ set but not used [-Wunused-but-set-variable] Assign the girq->first to it. Fixes: 8f86a5b4ad67 ("gpio: merrifield: Pass irqchip when adding gpiochip") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-merrifield.c | 1 + 1 file changed, 1 insertion(+)