diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 22:38:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 22:38:23 +0000 |
| commit | 87e4f9f0093dc01a136830f76313c54372692953 (patch) | |
| tree | 5e6aa154107ff8375cdb96a05025c969c7a3424d /target/linux/cns3xxx/files | |
| parent | 91278df70e2139cfea3357fa9053bb69dd76cf66 (diff) | |
| download | upstream-87e4f9f0093dc01a136830f76313c54372692953.tar.gz upstream-87e4f9f0093dc01a136830f76313c54372692953.tar.bz2 upstream-87e4f9f0093dc01a136830f76313c54372692953.zip | |
cns3xxx: update to linux 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48334
Diffstat (limited to 'target/linux/cns3xxx/files')
| -rw-r--r-- | target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |