From 16cfed3365a82eeeff2d6b93a3dd6711effb6424 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 18 Jan 2016 22:38:23 +0000 Subject: cns3xxx: update to linux 4.4 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48334 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/cns3xxx/files') diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c index b6e40614d0..19de24c349 100644 --- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c +++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c @@ -139,10 +139,10 @@ static int cns3xxx_gpio_to_irq(struct gpio_chip *chip, unsigned pin) /* one interrupt per GPIO controller (GPIOA/GPIOB) * this is called in task context, with IRQs enabled */ -static void cns3xxx_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +static void cns3xxx_gpio_irq_handler(struct irq_desc *desc) { - struct cns3xxx_gpio_chip *cchip = irq_get_handler_data(irq); - struct irq_chip *chip = irq_get_chip(irq); + struct cns3xxx_gpio_chip *cchip = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_desc_get_chip(desc); u16 i; u32 reg; @@ -211,9 +211,9 @@ static int cns3xxx_gpio_irq_set_type(struct irq_data *d, u32 irqtype) spin_unlock_irqrestore(&cchip->lock, flags); if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) - __irq_set_handler_locked(d->irq, handle_level_irq); + irq_set_handler_locked(d, handle_level_irq); else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)) - __irq_set_handler_locked(d->irq, handle_edge_irq); + irq_set_handler_locked(d, handle_edge_irq); return 0; } -- cgit v1.2.3