Merge tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[cascardo/linux.git] / arch / arm / mach-mmp / pm-mmp2.c

diff --git a/arch/arm/mach-mmp/pm-mmp2.c b/arch/arm/mach-mmp/pm-mmp2.c
index 461a191..43b1a51 100644 (file)
--- a/arch/arm/mach-mmp/pm-mmp2.c
+++ b/arch/arm/mach-mmp/pm-mmp2.c
@@ -27,22 +27,8 @@
 
 int mmp2_set_wake(struct irq_data *d, unsigned int on)
 {
-       int irq = d->irq;
-       struct irq_desc *desc = irq_to_desc(irq);
        unsigned long data = 0;
-
-       if (unlikely(irq >= nr_irqs)) {
-               pr_err("IRQ nubmers are out of boundary!\n");
-               return -EINVAL;
-       }
-
-       if (on) {
-               if (desc->action)
-                       desc->action->flags |= IRQF_NO_SUSPEND;
-       } else {
-               if (desc->action)
-                       desc->action->flags &= ~IRQF_NO_SUSPEND;
-       }
+       int irq = d->irq;
 
        /* enable wakeup sources */
        switch (irq) {