Merge branch 'queue/irq/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index e8f97e03c9bb..ac53ff0a8086 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -194,11 +194,12 @@ out:
 
 static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct timbgpio *tgpio = irq_get_handler_data(irq);
+        struct timbgpio *tgpio = irq_desc_get_handler_data(desc);
+        struct irq_data *data = irq_desc_get_irq_data(desc);
         unsigned long ipr;
         int offset;
 
-        desc->irq_data.chip->irq_ack(irq_get_irq_data(irq));
+        data->chip->irq_ack(data);
         ipr = ioread32(tgpio->membase + TGPIO_IPR);
         iowrite32(ipr, tgpio->membase + TGPIO_ICR);
 
@@ -299,8 +300,7 @@ static int timbgpio_probe(struct platform_device *pdev)
 #endif
         }
 
-        irq_set_handler_data(irq, tgpio);
-        irq_set_chained_handler(irq, timbgpio_irq);
+        irq_set_chained_handler_and_data(irq, timbgpio_irq, tgpio);
 
         return 0;
 }