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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop13xx
/
irq.c
diff --git
a/arch/arm/mach-iop13xx/irq.c
b/arch/arm/mach-iop13xx/irq.c
index
0d099ca
..
a233470
100644
(file)
--- a/
arch/arm/mach-iop13xx/irq.c
+++ b/
arch/arm/mach-iop13xx/irq.c
@@
-123,79
+123,79
@@
static void write_intsize(u32 val)
/* 0 = Interrupt Masked and 1 = Interrupt not masked */
static void
/* 0 = Interrupt Masked and 1 = Interrupt not masked */
static void
-iop13xx_irq_mask0 (
unsigned int irq
)
+iop13xx_irq_mask0 (
struct irq_data *d
)
{
{
- write_intctl_0(read_intctl_0() & ~(1 << (irq - 0)));
+ write_intctl_0(read_intctl_0() & ~(1 << (
d->
irq - 0)));
}
static void
}
static void
-iop13xx_irq_mask1 (
unsigned int irq
)
+iop13xx_irq_mask1 (
struct irq_data *d
)
{
{
- write_intctl_1(read_intctl_1() & ~(1 << (irq - 32)));
+ write_intctl_1(read_intctl_1() & ~(1 << (
d->
irq - 32)));
}
static void
}
static void
-iop13xx_irq_mask2 (
unsigned int irq
)
+iop13xx_irq_mask2 (
struct irq_data *d
)
{
{
- write_intctl_2(read_intctl_2() & ~(1 << (irq - 64)));
+ write_intctl_2(read_intctl_2() & ~(1 << (
d->
irq - 64)));
}
static void
}
static void
-iop13xx_irq_mask3 (
unsigned int irq
)
+iop13xx_irq_mask3 (
struct irq_data *d
)
{
{
- write_intctl_3(read_intctl_3() & ~(1 << (irq - 96)));
+ write_intctl_3(read_intctl_3() & ~(1 << (
d->
irq - 96)));
}
static void
}
static void
-iop13xx_irq_unmask0(
unsigned int irq
)
+iop13xx_irq_unmask0(
struct irq_data *d
)
{
{
- write_intctl_0(read_intctl_0() | (1 << (irq - 0)));
+ write_intctl_0(read_intctl_0() | (1 << (
d->
irq - 0)));
}
static void
}
static void
-iop13xx_irq_unmask1(
unsigned int irq
)
+iop13xx_irq_unmask1(
struct irq_data *d
)
{
{
- write_intctl_1(read_intctl_1() | (1 << (irq - 32)));
+ write_intctl_1(read_intctl_1() | (1 << (
d->
irq - 32)));
}
static void
}
static void
-iop13xx_irq_unmask2(
unsigned int irq
)
+iop13xx_irq_unmask2(
struct irq_data *d
)
{
{
- write_intctl_2(read_intctl_2() | (1 << (irq - 64)));
+ write_intctl_2(read_intctl_2() | (1 << (
d->
irq - 64)));
}
static void
}
static void
-iop13xx_irq_unmask3(
unsigned int irq
)
+iop13xx_irq_unmask3(
struct irq_data *d
)
{
{
- write_intctl_3(read_intctl_3() | (1 << (irq - 96)));
+ write_intctl_3(read_intctl_3() | (1 << (
d->
irq - 96)));
}
static struct irq_chip iop13xx_irqchip1 = {
}
static struct irq_chip iop13xx_irqchip1 = {
- .name = "IOP13xx-1",
- .ack = iop13xx_irq_mask0,
- .mask = iop13xx_irq_mask0,
- .unmask = iop13xx_irq_unmask0,
+ .name
= "IOP13xx-1",
+ .
irq_
ack = iop13xx_irq_mask0,
+ .
irq_
mask = iop13xx_irq_mask0,
+ .
irq_
unmask = iop13xx_irq_unmask0,
};
static struct irq_chip iop13xx_irqchip2 = {
};
static struct irq_chip iop13xx_irqchip2 = {
- .name = "IOP13xx-2",
- .ack = iop13xx_irq_mask1,
- .mask = iop13xx_irq_mask1,
- .unmask = iop13xx_irq_unmask1,
+ .name
= "IOP13xx-2",
+ .
irq_
ack = iop13xx_irq_mask1,
+ .
irq_
mask = iop13xx_irq_mask1,
+ .
irq_
unmask = iop13xx_irq_unmask1,
};
static struct irq_chip iop13xx_irqchip3 = {
};
static struct irq_chip iop13xx_irqchip3 = {
- .name = "IOP13xx-3",
- .ack = iop13xx_irq_mask2,
- .mask = iop13xx_irq_mask2,
- .unmask = iop13xx_irq_unmask2,
+ .name
= "IOP13xx-3",
+ .
irq_
ack = iop13xx_irq_mask2,
+ .
irq_
mask = iop13xx_irq_mask2,
+ .
irq_
unmask = iop13xx_irq_unmask2,
};
static struct irq_chip iop13xx_irqchip4 = {
};
static struct irq_chip iop13xx_irqchip4 = {
- .name = "IOP13xx-4",
- .ack = iop13xx_irq_mask3,
- .mask = iop13xx_irq_mask3,
- .unmask = iop13xx_irq_unmask3,
+ .name
= "IOP13xx-4",
+ .
irq_
ack = iop13xx_irq_mask3,
+ .
irq_
mask = iop13xx_irq_mask3,
+ .
irq_
unmask = iop13xx_irq_unmask3,
};
extern void iop_init_cp6_handler(void);
};
extern void iop_init_cp6_handler(void);