2021-07-01 00:47:27

by Mark-PK Tsai

Subject: [PATCH] PM: sleep: use ktime_us_delta in initcall_debug_report()

usecs is no more used after trace_device_pm_report_time replaced
by device_pm_callback_start/end in the below change.

commit e8bca479c3f2 ("PM / sleep: trace events for device PM callbacks")

Use ktime_us_delta to make the debug log more precise instead of
nsecs >> 10.

Signed-off-by: Mark-PK Tsai <[email protected]>
---
drivers/base/power/main.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index f893c3c5af07..d568772152c2 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -220,16 +220,13 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime,
void *cb, int error)
{
ktime_t rettime;
- s64 nsecs;

if (!pm_print_times_enabled)
return;

rettime = ktime_get();
- nsecs = (s64) ktime_to_ns(ktime_sub(rettime, calltime));
-
dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error,
- (unsigned long long)nsecs >> 10);
+ (unsigned long long)ktime_us_delta(rettime, calltime));
}

/**
--
2.18.0

2021-07-01 16:49:05

by Rafael J. Wysocki

Subject: Re: [PATCH] PM: sleep: use ktime_us_delta in initcall_debug_report()

On Thu, Jul 1, 2021 at 2:45 AM Mark-PK Tsai <[email protected]> wrote:
>
> usecs is no more used after trace_device_pm_report_time replaced
> by device_pm_callback_start/end in the below change.
>
> commit e8bca479c3f2 ("PM / sleep: trace events for device PM callbacks")
>
> Use ktime_us_delta to make the debug log more precise instead of
> nsecs >> 10.
>
> Signed-off-by: Mark-PK Tsai <[email protected]>
> ---
> drivers/base/power/main.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
> index f893c3c5af07..d568772152c2 100644
> --- a/drivers/base/power/main.c
> +++ b/drivers/base/power/main.c
> @@ -220,16 +220,13 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime,
> void *cb, int error)
> {
> ktime_t rettime;
> - s64 nsecs;
>
> if (!pm_print_times_enabled)
> return;
>
> rettime = ktime_get();
> - nsecs = (s64) ktime_to_ns(ktime_sub(rettime, calltime));
> -
> dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error,
> - (unsigned long long)nsecs >> 10);
> + (unsigned long long)ktime_us_delta(rettime, calltime));
> }
>
> /**
> --

Applied as 5.14-rc1 material with some edits in the subject and
changelog, thanks!