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 'docs' of git://git.lwn.net/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
common
/
it8152.c
diff --git
a/arch/arm/common/it8152.c
b/arch/arm/common/it8152.c
index
5382622
..
2793447
100644
(file)
--- a/
arch/arm/common/it8152.c
+++ b/
arch/arm/common/it8152.c
@@
-66,14
+66,6
@@
static void it8152_unmask_irq(unsigned int irq)
}
}
}
}
-static inline void it8152_irq(int irq)
-{
- struct irq_desc *desc;
-
- desc = irq_desc + irq;
- desc_handle_irq(irq, desc);
-}
-
static struct irq_chip it8152_irq_chip = {
.name = "it8152",
.ack = it8152_mask_irq,
static struct irq_chip it8152_irq_chip = {
.name = "it8152",
.ack = it8152_mask_irq,
@@
-120,6
+112,7
@@
void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
time, when they all three were 0. */
bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
bits_lp = __raw_readl(IT8152_INTC_LPCNIRR);
time, when they all three were 0. */
bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
bits_lp = __raw_readl(IT8152_INTC_LPCNIRR);
+ bits_ld = __raw_readl(IT8152_INTC_LDCNIRR);
if (!(bits_ld | bits_lp | bits_pd))
return;
}
if (!(bits_ld | bits_lp | bits_pd))
return;
}
@@
-127,21
+120,21
@@
void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);
while (bits_pd) {
i = __ffs(bits_pd);
bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);
while (bits_pd) {
i = __ffs(bits_pd);
-
it8152
_irq(IT8152_PD_IRQ(i));
+
generic_handle
_irq(IT8152_PD_IRQ(i));
bits_pd &= ~(1 << i);
}
bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
while (bits_lp) {
bits_pd &= ~(1 << i);
}
bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
while (bits_lp) {
- i = __ffs(bits_
pd
);
-
it8152
_irq(IT8152_LP_IRQ(i));
+ i = __ffs(bits_
lp
);
+
generic_handle
_irq(IT8152_LP_IRQ(i));
bits_lp &= ~(1 << i);
}
bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
while (bits_ld) {
bits_lp &= ~(1 << i);
}
bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
while (bits_ld) {
- i = __ffs(bits_
p
d);
-
it8152
_irq(IT8152_LD_IRQ(i));
+ i = __ffs(bits_
l
d);
+
generic_handle
_irq(IT8152_LD_IRQ(i));
bits_ld &= ~(1 << i);
}
}
bits_ld &= ~(1 << i);
}
}