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 remote-tracking branches 'regulator/fix/anatop', 'regulator/fix/gpio', 'regulat...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
irqchip
/
irq-vic.c
diff --git
a/drivers/irqchip/irq-vic.c
b/drivers/irqchip/irq-vic.c
index 03846dff42123c96079489f998ed18e7623ff576..b956dfffe78ca1b64a469aac808223718090f3a7 100644
(file)
--- a/
drivers/irqchip/irq-vic.c
+++ b/
drivers/irqchip/irq-vic.c
@@
-201,7
+201,7
@@
static int vic_irqdomain_map(struct irq_domain *d, unsigned int irq,
return -EPERM;
irq_set_chip_and_handler(irq, &vic_chip, handle_level_irq);
irq_set_chip_data(irq, v->base);
return -EPERM;
irq_set_chip_and_handler(irq, &vic_chip, handle_level_irq);
irq_set_chip_data(irq, v->base);
-
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE
);
+
irq_set_probe(irq
);
return 0;
}
return 0;
}
@@
-225,7
+225,7
@@
static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)
return handled;
}
return handled;
}
-static void vic_handle_irq_cascaded(
unsigned int irq,
struct irq_desc *desc)
+static void vic_handle_irq_cascaded(struct irq_desc *desc)
{
u32 stat, hwirq;
struct irq_chip *host_chip = irq_desc_get_chip(desc);
{
u32 stat, hwirq;
struct irq_chip *host_chip = irq_desc_get_chip(desc);