From bfbebce3f71295421c62c9968543f140ae9481f6 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Thu, 24 Jun 2021 17:53:28 -0700 Subject: [PATCH] ANDROID: power: wakeup_reason: change abort log Logging callback symbolic name is generating too many different messages making Abort analysis miss big trends. Stick to console reported message providing sufficient information. Bug: 280678242 Signed-off-by: Thierry Strudel (cherry picked from https://android-review.googlesource.com/q/commit:9f8f2ea03ede21d8928793c4be87eeb76d81bc7f) Merged-In: Ic0ea662a60919454060e3a085aeabd8a4099e0b4 Change-Id: Ic0ea662a60919454060e3a085aeabd8a4099e0b4 --- drivers/base/power/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 5ebfb4084762..69a485fff42e 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1242,8 +1242,8 @@ Run: error = dpm_run_callback(callback, dev, state, info); if (error) { async_error = error; - log_suspend_abort_reason("Callback failed on %s in %pS returned %d", - dev_name(dev), callback, error); + log_suspend_abort_reason("Device %s failed to %s noirq: error %d", + dev_name(dev), pm_verb(state.event), error); goto Complete; } @@ -1438,8 +1438,8 @@ Run: error = dpm_run_callback(callback, dev, state, info); if (error) { async_error = error; - log_suspend_abort_reason("Callback failed on %s in %pS returned %d", - dev_name(dev), callback, error); + log_suspend_abort_reason("Device %s failed to %s late: error %d", + dev_name(dev), pm_verb(state.event), error); goto Complete; } dpm_propagate_wakeup_to_parent(dev); @@ -1717,8 +1717,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) dpm_propagate_wakeup_to_parent(dev); dpm_clear_superiors_direct_complete(dev); } else { - log_suspend_abort_reason("Callback failed on %s in %pS returned %d", - dev_name(dev), callback, error); + log_suspend_abort_reason("Device %s failed to %s: error %d", + dev_name(dev), pm_verb(state.event), error); } device_unlock(dev);