X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fpinctrl%2Fpinctrl-pistachio.c;h=3dc2ae15f3a10f723813f78d34420ea1fb4650e9;hb=f43ebaf126d3f4b869ba5bcfb11a00f33f0892cf;hp=63100be8101520d0c3fb51cd08dd1603b4919b37;hpb=fc02a46938fa2dd2494e20ca7b81c687bd027df4;p=deliverable%2Flinux.git

diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
index 63100be81015..3dc2ae15f3a1 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
@@ -1310,9 +1310,11 @@ static int pistachio_gpio_irq_set_type(struct irq_data *data, unsigned int type)
 	return 0;
 }
 
-static void pistachio_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pistachio_gpio_irq_handler(unsigned int __irq,
+				       struct irq_desc *desc)
 {
-	struct gpio_chip *gc = irq_get_handler_data(irq);
+	unsigned int irq = irq_desc_get_irq(desc);
+	struct gpio_chip *gc = irq_desc_get_handler_data(desc);
 	struct pistachio_gpio_bank *bank = gc_to_bank(gc);
 	struct irq_chip *chip = irq_get_chip(irq);
 	unsigned long pending;