From e58735c802f823a1e886f6229a0598d94f677cf7 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 15:54:03 +0100 Subject: [PATCH] --- yaml --- r: 243334 b: refs/heads/master c: 212d786dabfee69c2ce5498821c2a0a679a1197b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/52xx/media5200.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d86c7e5aafd7..3bdf30dc86d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98488db9ff01849354bffb6a9675b1cc2ecf03fd +refs/heads/master: 212d786dabfee69c2ce5498821c2a0a679a1197b diff --git a/trunk/arch/powerpc/platforms/52xx/media5200.c b/trunk/arch/powerpc/platforms/52xx/media5200.c index 6cd041baa727..ef244f251687 100644 --- a/trunk/arch/powerpc/platforms/52xx/media5200.c +++ b/trunk/arch/powerpc/platforms/52xx/media5200.c @@ -115,15 +115,10 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc) static int media5200_irq_map(struct irq_host *h, unsigned int virq, irq_hw_number_t hw) { - struct irq_desc *desc = irq_to_desc(virq); - pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw); set_irq_chip_data(virq, &media5200_irq); set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq); - set_irq_type(virq, IRQ_TYPE_LEVEL_LOW); - desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL); - desc->status |= IRQ_TYPE_LEVEL_LOW | IRQ_LEVEL; - + irq_set_status_flags(virq, IRQ_LEVEL); return 0; }