pinctrl/adi2: Use irq_set_handler_locked()

[deliverable/linux.git] / drivers / pinctrl / pinctrl-adi2.c

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index 873433da0f2ce192651aa9003946399d16e82a0f..a5976ebc4482633514e7b8b6259b528b2bb2c0ed 100644 (file)
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -427,10 +427,10 @@ static int adi_gpio_irq_type(struct irq_data *d, unsigned int type)
 
        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
                writel(pintmask, &pint_regs->edge_set);
-               __irq_set_handler_locked(irq, handle_edge_irq);
+               irq_set_handler_locked(d, handle_edge_irq);
        } else {
                writel(pintmask, &pint_regs->edge_clear);
-               __irq_set_handler_locked(irq, handle_level_irq);
+               irq_set_handler_locked(d, handle_level_irq);
        }
 
 out:
@@ -865,8 +865,8 @@ static int adi_gpio_pint_probe(struct platform_device *pdev)
        pint->pint_map_port = adi_pint_map_port;
        platform_set_drvdata(pdev, pint);
 
-       irq_set_chained_handler(pint->irq, adi_gpio_handle_pint_irq);
-       irq_set_handler_data(pint->irq, pint);
+       irq_set_chained_handler_and_data(pint->irq, adi_gpio_handle_pint_irq,
+                                        pint);
 
        list_add_tail(&pint->node, &adi_pint_list);