2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 901e4e06b377..6fcb28cdd862 100644
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -315,8 +315,8 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
                 else
                         pl061_direction_input(&chip->gc, i);
 
-                irq_set_chip(i + chip->irq_base, &pl061_irqchip);
-                irq_set_handler(i + chip->irq_base, handle_simple_irq);
+                irq_set_chip_and_handler(i + chip->irq_base, &pl061_irqchip,
+                                         handle_simple_irq);
                 set_irq_flags(i+chip->irq_base, IRQF_VALID);
                 irq_set_chip_data(i + chip->irq_base, chip);
         }
diff --git a/drivers/gpio/sx150x.c b/drivers/gpio/sx150x.c
index 0370ecf63edf..a4f73534394e 100644
--- a/drivers/gpio/sx150x.c
+++ b/drivers/gpio/sx150x.c
@@ -583,8 +583,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip)
 
         for (n = 0; n < chip->dev_cfg->ngpios; ++n) {
                 irq = chip->irq_base + n;
-                irq_set_handler(irq, NULL);
-                irq_set_chip(irq, NULL);
+                irq_set_chip_and_handler(irq, NULL, NULL);
         }
 }