summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-25 16:26:01 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 14:48:11 +0200
commit773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3 (patch)
tree6c2e1978e9615b5244dcd587185b507035f4877f
parent1ac06cdadf3f6e9c52cf87304238bffdf4c71566 (diff)
downloadlinux-stable-773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3.tar.gz
linux-stable-773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3.tar.bz2
linux-stable-773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3.zip
powerpc: xilinx: Cleanup flow type handling
The core irq_set_type() function updates the flow type when the chip callback returns 0. So setting the type is bogus. The core also updates the LEVEL flag. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/powerpc/sysdev/xilinx_intc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index 7436f3ed4df6..c5bb44410762 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -79,12 +79,6 @@ static void xilinx_intc_mask(struct irq_data *d)
static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type)
{
- struct irq_desc *desc = irq_to_desc(d->irq);
-
- desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
- desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
- if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
- desc->status |= IRQ_LEVEL;
return 0;
}