summaryrefslogtreecommitdiffstats
path: root/kernel/irq/pm.c
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2015-06-23 19:52:36 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-07-11 23:14:24 +0200
commit79ff1cda320b81dfe5feae0c5da52f029561ce93 (patch)
tree50b4c667d34d7969917634346719aa95cce8c35c /kernel/irq/pm.c
parentgenirq: Remove irq arg from __irq_set_trigger() (diff)
downloadlinux-79ff1cda320b81dfe5feae0c5da52f029561ce93.tar.xz
linux-79ff1cda320b81dfe5feae0c5da52f029561ce93.zip
genirq: Remove irq argument from __enable/__disable_irq()
Solely used for debug output. Can be retrieved from irq descriptor if necessary. [ tglx: Split out from combo patch ] Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to '')
-rw-r--r--kernel/irq/pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index d22786a6dbde..0e1c617f8d5f 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -85,7 +85,7 @@ static bool suspend_device_irq(struct irq_desc *desc, int irq)
}
desc->istate |= IRQS_SUSPENDED;
- __disable_irq(desc, irq);
+ __disable_irq(desc);
/*
* Hardware which has no wakeup source configuration facility
@@ -150,7 +150,7 @@ static void resume_irq(struct irq_desc *desc, int irq)
desc->depth++;
resume:
desc->istate &= ~IRQS_SUSPENDED;
- __enable_irq(desc, irq);
+ __enable_irq(desc);
}
static void resume_irqs(bool want_early)