1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
index ffcd815b8b8b..edbe1eae531f 100644
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@ -196,7 +196,7 @@ out:
 
 static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct timbgpio *tgpio = get_irq_data(irq);
+        struct timbgpio *tgpio = irq_get_handler_data(irq);
         unsigned long ipr;
         int offset;
 
@@ -292,16 +292,16 @@ static int __devinit timbgpio_probe(struct platform_device *pdev)
                 return 0;
 
         for (i = 0; i < pdata->nr_pins; i++) {
-                set_irq_chip_and_handler_name(tgpio->irq_base + i,
+                irq_set_chip_and_handler_name(tgpio->irq_base + i,
                         &timbgpio_irqchip, handle_simple_irq, "mux");
-                set_irq_chip_data(tgpio->irq_base + i, tgpio);
+                irq_set_chip_data(tgpio->irq_base + i, tgpio);
 #ifdef CONFIG_ARM
                 set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE);
 #endif
         }
 
-        set_irq_data(irq, tgpio);
-        set_irq_chained_handler(irq, timbgpio_irq);
+        irq_set_handler_data(irq, tgpio);
+        irq_set_chained_handler(irq, timbgpio_irq);
 
         return 0;
 
@@ -327,12 +327,12 @@ static int __devexit timbgpio_remove(struct platform_device *pdev)
         if (irq >= 0 && tgpio->irq_base > 0) {
                 int i;
                 for (i = 0; i < tgpio->gpio.ngpio; i++) {
-                        set_irq_chip(tgpio->irq_base + i, NULL);
-                        set_irq_chip_data(tgpio->irq_base + i, NULL);
+                        irq_set_chip(tgpio->irq_base + i, NULL);
+                        irq_set_chip_data(tgpio->irq_base + i, NULL);
                 }
 
-                set_irq_handler(irq, NULL);
-                set_irq_data(irq, NULL);
+                irq_set_handler(irq, NULL);
+                irq_set_handler_data(irq, NULL);
         }
 
         err = gpiochip_remove(&tgpio->gpio);