summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/gpio/gpio-sa1100.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/gpio/gpio-sa1100.c')
-rw-r--r--kernel/drivers/gpio/gpio-sa1100.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/drivers/gpio/gpio-sa1100.c b/kernel/drivers/gpio/gpio-sa1100.c
index bec397a60..990fa9023 100644
--- a/kernel/drivers/gpio/gpio-sa1100.c
+++ b/kernel/drivers/gpio/gpio-sa1100.c
@@ -155,12 +155,12 @@ static int sa1100_gpio_irqdomain_map(struct irq_domain *d,
{
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;
}
-static struct irq_domain_ops sa1100_gpio_irqdomain_ops = {
+static const struct irq_domain_ops sa1100_gpio_irqdomain_ops = {
.map = sa1100_gpio_irqdomain_map,
.xlate = irq_domain_xlate_onetwocell,
};
@@ -172,10 +172,9 @@ static struct irq_domain *sa1100_gpio_irqdomain;
* irq_controller_lock held, and IRQs disabled. Decode the IRQ
* and call the handler.
*/
-static void
-sa1100_gpio_handler(unsigned int irq, struct irq_desc *desc)
+static void sa1100_gpio_handler(struct irq_desc *desc)
{
- unsigned int mask;
+ unsigned int irq, mask;
mask = GEDR;
do {