Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
mach-rpc
/
irq.c
diff --git
a/kernel/arch/arm/mach-rpc/irq.c
b/kernel/arch/arm/mach-rpc/irq.c
index
3e4fa84
..
66502e6
100644
(file)
--- a/
kernel/arch/arm/mach-rpc/irq.c
+++ b/
kernel/arch/arm/mach-rpc/irq.c
@@
-117,7
+117,7
@@
extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;
void __init rpc_init_irq(void)
{
void __init rpc_init_irq(void)
{
- unsigned int irq,
flags
;
+ unsigned int irq,
clr, set = 0
;
iomd_writeb(0, IOMD_IRQMASKA);
iomd_writeb(0, IOMD_IRQMASKB);
iomd_writeb(0, IOMD_IRQMASKA);
iomd_writeb(0, IOMD_IRQMASKB);
@@
-128,37
+128,37
@@
void __init rpc_init_irq(void)
&rpc_default_fiq_end - &rpc_default_fiq_start);
for (irq = 0; irq < NR_IRQS; irq++) {
&rpc_default_fiq_end - &rpc_default_fiq_start);
for (irq = 0; irq < NR_IRQS; irq++) {
-
flags = IRQF_VALID
;
+
clr = IRQ_NOREQUEST
;
if (irq <= 6 || (irq >= 9 && irq <= 15))
if (irq <= 6 || (irq >= 9 && irq <= 15))
-
flags |= IRQF_
PROBE;
+
clr |= IRQ_NO
PROBE;
if (irq == 21 || (irq >= 16 && irq <= 19) ||
irq == IRQ_KEYBOARDTX)
if (irq == 21 || (irq >= 16 && irq <= 19) ||
irq == IRQ_KEYBOARDTX)
-
flags |= IRQF
_NOAUTOEN;
+
set |= IRQ
_NOAUTOEN;
switch (irq) {
case 0 ... 7:
irq_set_chip_and_handler(irq, &iomd_a_chip,
handle_level_irq);
switch (irq) {
case 0 ... 7:
irq_set_chip_and_handler(irq, &iomd_a_chip,
handle_level_irq);
-
set_irq_flags(irq, flags
);
+
irq_modify_status(irq, clr, set
);
break;
case 8 ... 15:
irq_set_chip_and_handler(irq, &iomd_b_chip,
handle_level_irq);
break;
case 8 ... 15:
irq_set_chip_and_handler(irq, &iomd_b_chip,
handle_level_irq);
-
set_irq_flags(irq, flags
);
+
irq_modify_status(irq, clr, set
);
break;
case 16 ... 21:
irq_set_chip_and_handler(irq, &iomd_dma_chip,
handle_level_irq);
break;
case 16 ... 21:
irq_set_chip_and_handler(irq, &iomd_dma_chip,
handle_level_irq);
-
set_irq_flags(irq, flags
);
+
irq_modify_status(irq, clr, set
);
break;
case 64 ... 71:
irq_set_chip(irq, &iomd_fiq_chip);
break;
case 64 ... 71:
irq_set_chip(irq, &iomd_fiq_chip);
-
set_irq_flags(irq, IRQF_VALID
);
+
irq_modify_status(irq, clr, set
);
break;
}
}
break;
}
}