projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Yosemite: Fix missing parens in SERIAL_READ_1 macro
[powerpc.git]
/
arch
/
mips
/
kernel
/
irq-rm9000.c
diff --git
a/arch/mips/kernel/irq-rm9000.c
b/arch/mips/kernel/irq-rm9000.c
index
2e68e4b
..
ae83d2d
100644
(file)
--- a/
arch/mips/kernel/irq-rm9000.c
+++ b/
arch/mips/kernel/irq-rm9000.c
@@
-18,16
+18,14
@@
#include <asm/mipsregs.h>
#include <asm/system.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
-static int irq_base;
-
static inline void unmask_rm9k_irq(unsigned int irq)
{
static inline void unmask_rm9k_irq(unsigned int irq)
{
- set_c0_intcontrol(0x1000 << (irq -
irq_base
));
+ set_c0_intcontrol(0x1000 << (irq -
RM9K_CPU_IRQ_BASE
));
}
static inline void mask_rm9k_irq(unsigned int irq)
{
}
static inline void mask_rm9k_irq(unsigned int irq)
{
- clear_c0_intcontrol(0x1000 << (irq -
irq_base
));
+ clear_c0_intcontrol(0x1000 << (irq -
RM9K_CPU_IRQ_BASE
));
}
static inline void rm9k_cpu_irq_enable(unsigned int irq)
}
static inline void rm9k_cpu_irq_enable(unsigned int irq)
@@
-72,7
+70,7
@@
static void rm9k_perfcounter_irq_shutdown(unsigned int irq)
}
static struct irq_chip rm9k_irq_controller = {
}
static struct irq_chip rm9k_irq_controller = {
- .
type
name = "RM9000",
+ .name = "RM9000",
.ack = mask_rm9k_irq,
.mask = mask_rm9k_irq,
.mask_ack = mask_rm9k_irq,
.ack = mask_rm9k_irq,
.mask = mask_rm9k_irq,
.mask_ack = mask_rm9k_irq,
@@
-80,7
+78,7
@@
static struct irq_chip rm9k_irq_controller = {
};
static struct irq_chip rm9k_perfcounter_irq = {
};
static struct irq_chip rm9k_perfcounter_irq = {
- .
type
name = "RM9000",
+ .name = "RM9000",
.startup = rm9k_perfcounter_irq_startup,
.shutdown = rm9k_perfcounter_irq_shutdown,
.ack = mask_rm9k_irq,
.startup = rm9k_perfcounter_irq_startup,
.shutdown = rm9k_perfcounter_irq_shutdown,
.ack = mask_rm9k_irq,
@@
-93,8
+91,9
@@
unsigned int rm9000_perfcount_irq;
EXPORT_SYMBOL(rm9000_perfcount_irq);
EXPORT_SYMBOL(rm9000_perfcount_irq);
-void __init rm9k_cpu_irq_init(
int base
)
+void __init rm9k_cpu_irq_init(
void
)
{
{
+ int base = RM9K_CPU_IRQ_BASE;
int i;
clear_c0_intcontrol(0x0000f000); /* Mask all */
int i;
clear_c0_intcontrol(0x0000f000); /* Mask all */
@@
-106,6
+105,4
@@
void __init rm9k_cpu_irq_init(int base)
rm9000_perfcount_irq = base + 1;
set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq,
handle_level_irq);
rm9000_perfcount_irq = base + 1;
set_irq_chip_and_handler(rm9000_perfcount_irq, &rm9k_perfcounter_irq,
handle_level_irq);
-
- irq_base = base;
}
}