Merge remote-tracking branch 'powerpc/next'

[karo-tx-linux.git] / arch / powerpc / sysdev / mpic.c

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index cecd1156c1852a71b6f0432c77fd1410eda767d1..2a0452e364ba70a49c9985e086bc20a724b2cb16 100644 (file)
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -924,22 +924,6 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
        return IRQ_SET_MASK_OK_NOCOPY;
 }
 
-static int mpic_irq_set_wake(struct irq_data *d, unsigned int on)
-{
-       struct irq_desc *desc = container_of(d, struct irq_desc, irq_data);
-       struct mpic *mpic = mpic_from_irq_data(d);
-
-       if (!(mpic->flags & MPIC_FSL))
-               return -ENXIO;
-
-       if (on)
-               desc->action->flags |= IRQF_NO_SUSPEND;
-       else
-               desc->action->flags &= ~IRQF_NO_SUSPEND;
-
-       return 0;
-}
-
 void mpic_set_vector(unsigned int virq, unsigned int vector)
 {
        struct mpic *mpic = mpic_from_irq(virq);
@@ -977,7 +961,6 @@ static struct irq_chip mpic_irq_chip = {
        .irq_unmask     = mpic_unmask_irq,
        .irq_eoi        = mpic_end_irq,
        .irq_set_type   = mpic_set_irq_type,
-       .irq_set_wake   = mpic_irq_set_wake,
 };
 
 #ifdef CONFIG_SMP
@@ -992,7 +975,6 @@ static struct irq_chip mpic_tm_chip = {
        .irq_mask       = mpic_mask_tm,
        .irq_unmask     = mpic_unmask_tm,
        .irq_eoi        = mpic_end_irq,
-       .irq_set_wake   = mpic_irq_set_wake,
 };
 
 #ifdef CONFIG_MPIC_U3_HT_IRQS
@@ -1284,8 +1266,11 @@ struct mpic * __init mpic_alloc(struct device_node *node,
                flags |= MPIC_NO_RESET;
        if (of_get_property(node, "single-cpu-affinity", NULL))
                flags |= MPIC_SINGLE_DEST_CPU;
-       if (of_device_is_compatible(node, "fsl,mpic"))
+       if (of_device_is_compatible(node, "fsl,mpic")) {
                flags |= MPIC_FSL | MPIC_LARGE_VECTORS;
+               mpic_irq_chip.flags |= IRQCHIP_SKIP_SET_WAKE;
+               mpic_tm_chip.flags |= IRQCHIP_SKIP_SET_WAKE;
+       }
 
        mpic = kzalloc(sizeof(struct mpic), GFP_KERNEL);
        if (mpic == NULL)