gpio: pcie-idio-24: Use irqchip template
This makes the driver use the irqchip template to assign properties to the gpio_irq_chip instead of using the explicit call to gpiochip_irqchip_add(). The irqchip is instead added while adding the gpiochip. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com> Cc: William Breathitt Gray <vilhelm.gray@gmail.com> Link: https://lore.kernel.org/r/20200722110027.192782-1-linus.walleij@linaro.org
This commit is contained in:
parent
82e4613d3d
commit
866e863edb
|
@ -457,6 +457,7 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
int err;
|
||||
const size_t pci_bar_index = 2;
|
||||
const char *const name = pci_name(pdev);
|
||||
struct gpio_irq_chip *girq;
|
||||
|
||||
idio24gpio = devm_kzalloc(dev, sizeof(*idio24gpio), GFP_KERNEL);
|
||||
if (!idio24gpio)
|
||||
|
@ -490,6 +491,15 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
idio24gpio->chip.set = idio_24_gpio_set;
|
||||
idio24gpio->chip.set_multiple = idio_24_gpio_set_multiple;
|
||||
|
||||
girq = &idio24gpio->chip.irq;
|
||||
girq->chip = &idio_24_irqchip;
|
||||
/* This will let us handle the parent IRQ in the driver */
|
||||
girq->parent_handler = NULL;
|
||||
girq->num_parents = 0;
|
||||
girq->parents = NULL;
|
||||
girq->default_type = IRQ_TYPE_NONE;
|
||||
girq->handler = handle_edge_irq;
|
||||
|
||||
raw_spin_lock_init(&idio24gpio->lock);
|
||||
|
||||
/* Software board reset */
|
||||
|
@ -501,13 +511,6 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
return err;
|
||||
}
|
||||
|
||||
err = gpiochip_irqchip_add(&idio24gpio->chip, &idio_24_irqchip, 0,
|
||||
handle_edge_irq, IRQ_TYPE_NONE);
|
||||
if (err) {
|
||||
dev_err(dev, "Could not add irqchip (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = devm_request_irq(dev, pdev->irq, idio_24_irq_handler, IRQF_SHARED,
|
||||
name, idio24gpio);
|
||||
if (err) {
|
||||
|
|
Loading…
Reference in a new issue