projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm+acpi-4.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
drivers
/
gpio
/
gpio-sa1100.c
diff --git
a/drivers/gpio/gpio-sa1100.c
b/drivers/gpio/gpio-sa1100.c
index
3fa22da
..
67bd2f5
100644
(file)
--- a/
drivers/gpio/gpio-sa1100.c
+++ b/
drivers/gpio/gpio-sa1100.c
@@
-155,7
+155,7
@@
static int sa1100_gpio_irqdomain_map(struct irq_domain *d,
{
irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip,
handle_edge_irq);
{
irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip,
handle_edge_irq);
-
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE
);
+
irq_set_noprobe(irq
);
return 0;
}
return 0;
}
@@
-173,9
+173,9
@@
static struct irq_domain *sa1100_gpio_irqdomain;
* and call the handler.
*/
static void
* and call the handler.
*/
static void
-sa1100_gpio_handler(unsigned int irq, struct irq_desc *desc)
+sa1100_gpio_handler(unsigned int
__
irq, struct irq_desc *desc)
{
{
- unsigned int mask;
+ unsigned int
irq,
mask;
mask = GEDR;
do {
mask = GEDR;
do {