From 3a13e3b4ff688aae908bdb06ab55ad00c83bab4e Mon Sep 17 00:00:00 2001 From: Maggie White <maggiewhite@google.com> Date: Wed, 12 Apr 2017 15:52:05 -0700 Subject: [PATCH] power: Improved/fixed logs for PM wakeups PM wakeups were reporting in kernel and BatteryStats logs as abort suspends due to the PM IRQ handler logging a suspend abort, which prevented the normal wakeup resume messaging. Suspend abort reasons are already logged in pm_wakeup_pending() in drivers/base/power/wakeup.c. Bug: 34225014 Change-Id: I8b9ab597caef61b0d6f5b853b2947d6afc13d693 Signed-off-by: Maggie White <maggiewhite@google.com> --- kernel/irq/pm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 2abbaf8f334d..56eb8f191c10 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -21,10 +21,6 @@ bool irq_pm_check_wakeup(struct irq_desc *desc) desc->istate |= IRQS_SUSPENDED | IRQS_PENDING; desc->depth++; irq_disable(desc); - log_suspend_abort_reason("Wakeup IRQ %d %s pending", - desc->irq_data.irq, - (desc->action && desc->action->name) ? - desc->action->name : ""); pm_system_wakeup(); return true; } -- GitLab