projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
pinctrl-pistachio.c
diff --git
a/drivers/pinctrl/pinctrl-pistachio.c
b/drivers/pinctrl/pinctrl-pistachio.c
index 3dc2ae15f3a10f723813f78d34420ea1fb4650e9..952b1c62388773eb5594b03c7b0a639061c8f4b9 100644
(file)
--- a/
drivers/pinctrl/pinctrl-pistachio.c
+++ b/
drivers/pinctrl/pinctrl-pistachio.c
@@
-1303,20
+1303,18
@@
static int pistachio_gpio_irq_set_type(struct irq_data *data, unsigned int type)
}
if (type & IRQ_TYPE_LEVEL_MASK)
}
if (type & IRQ_TYPE_LEVEL_MASK)
-
__irq_set_handler_locked(data->irq
, handle_level_irq);
+
irq_set_handler_locked(data
, handle_level_irq);
else
else
-
__irq_set_handler_locked(data->irq
, handle_edge_irq);
+
irq_set_handler_locked(data
, handle_edge_irq);
return 0;
}
return 0;
}
-static void pistachio_gpio_irq_handler(unsigned int __irq,
- struct irq_desc *desc)
+static void pistachio_gpio_irq_handler(struct irq_desc *desc)
{
{
- 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 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
);
+ struct irq_chip *chip = irq_
desc_get_chip(desc
);
unsigned long pending;
unsigned int pin;
unsigned long pending;
unsigned int pin;