diff options
| author | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
| commit | 3869e431b51f3010f0d3bfc007c4a1b957c0ae1f (patch) | |
| tree | cae985276ee0de390f9d127147f29612385e90c4 /drivers/pps | |
| parent | a9f349e3c0bebe7ae97750b32a72f452bdf707e2 (diff) | |
| parent | ace38521705bd79a47e5f46b6bae6dc044f3cfdc (diff) | |
Merge branch 'for-6.19-vsprintf-timespec64' into for-linus
Diffstat (limited to 'drivers/pps')
| -rw-r--r-- | drivers/pps/generators/pps_gen_parport.c | 3 | ||||
| -rw-r--r-- | drivers/pps/kapi.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c index f5eeb4dd01ad..05bbf8d30ef1 100644 --- a/drivers/pps/generators/pps_gen_parport.c +++ b/drivers/pps/generators/pps_gen_parport.c @@ -80,8 +80,7 @@ static enum hrtimer_restart hrtimer_event(struct hrtimer *timer) /* check if we are late */ if (expire_time.tv_sec != ts1.tv_sec || ts1.tv_nsec > lim) { local_irq_restore(flags); - pr_err("we are late this time %lld.%09ld\n", - (s64)ts1.tv_sec, ts1.tv_nsec); + pr_err("we are late this time %ptSp\n", &ts1); goto done; } diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c index 92d1b62ea239..dc6f279f5fda 100644 --- a/drivers/pps/kapi.c +++ b/drivers/pps/kapi.c @@ -166,8 +166,7 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event, /* check event type */ BUG_ON((event & (PPS_CAPTUREASSERT | PPS_CAPTURECLEAR)) == 0); - dev_dbg(&pps->dev, "PPS event at %lld.%09ld\n", - (s64)ts->ts_real.tv_sec, ts->ts_real.tv_nsec); + dev_dbg(&pps->dev, "PPS event at %ptSp\n", &ts->ts_real); timespec_to_pps_ktime(&ts_real, ts->ts_real); |