git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...
[pandora-kernel.git]
/
drivers
/
gpio
/
stmpe-gpio.c
diff --git
a/drivers/gpio/stmpe-gpio.c
b/drivers/gpio/stmpe-gpio.c
index
eb2901f
..
4c980b5
100644
(file)
--- a/
drivers/gpio/stmpe-gpio.c
+++ b/
drivers/gpio/stmpe-gpio.c
@@
-254,14
+254,14
@@
static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
int irq;
for (irq = base; irq < base + stmpe_gpio->chip.ngpio; irq++) {
int irq;
for (irq = base; irq < base + stmpe_gpio->chip.ngpio; irq++) {
-
set_irq
_chip_data(irq, stmpe_gpio);
-
set_irq
_chip_and_handler(irq, &stmpe_gpio_irq_chip,
+
irq_set
_chip_data(irq, stmpe_gpio);
+
irq_set
_chip_and_handler(irq, &stmpe_gpio_irq_chip,
handle_simple_irq);
handle_simple_irq);
-
set_irq
_nested_thread(irq, 1);
+
irq_set
_nested_thread(irq, 1);
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID);
#else
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID);
#else
-
set_irq
_noprobe(irq);
+
irq_set
_noprobe(irq);
#endif
}
#endif
}
@@
-277,8
+277,8
@@
static void stmpe_gpio_irq_remove(struct stmpe_gpio *stmpe_gpio)
#ifdef CONFIG_ARM
set_irq_flags(irq, 0);
#endif
#ifdef CONFIG_ARM
set_irq_flags(irq, 0);
#endif
-
set_irq
_chip_and_handler(irq, NULL, NULL);
-
set_irq
_chip_data(irq, NULL);
+
irq_set
_chip_and_handler(irq, NULL, NULL);
+
irq_set
_chip_data(irq, NULL);
}
}
}
}