From: Andy Shevchenko Date: Mon, 24 Nov 2025 08:45:45 +0000 (+0100) Subject: ptp: ocp: Refactor signal_show() and fix %ptT misuse X-Git-Tag: v6.19-rc1~170^2~72^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=622cc66ed72c2da2294de21da5976a087bcc5748;p=thirdparty%2Fkernel%2Flinux.git ptp: ocp: Refactor signal_show() and fix %ptT misuse Refactor signal_show() to avoid sequential calls to sysfs_emit*() and use the same pattern to get the index of a signal as it's done in signal_store(). While at it, fix wrong use of %ptT against struct timespec64. It's kinda lucky that it worked just because the first member there 64-bit and it's of time64_t type. Now with %ptS it may be used correctly. Reviewed-by: Vadim Fedorenko Signed-off-by: Andy Shevchenko Link: https://patch.msgid.link/20251124084816.205035-2-andriy.shevchenko@linux.intel.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index eeebe4d149f71..95889f85ffb26 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -3250,20 +3250,16 @@ signal_show(struct device *dev, struct device_attribute *attr, char *buf) struct dev_ext_attribute *ea = to_ext_attr(attr); struct ptp_ocp *bp = dev_get_drvdata(dev); struct ptp_ocp_signal *signal; + int gen = (uintptr_t)ea->var; struct timespec64 ts; - ssize_t count; - int i; - i = (uintptr_t)ea->var; - signal = &bp->signal[i]; - - count = sysfs_emit(buf, "%llu %d %llu %d", signal->period, - signal->duty, signal->phase, signal->polarity); + signal = &bp->signal[gen]; ts = ktime_to_timespec64(signal->start); - count += sysfs_emit_at(buf, count, " %ptT TAI\n", &ts); - return count; + return sysfs_emit(buf, "%llu %d %llu %d %ptT TAI\n", + signal->period, signal->duty, signal->phase, signal->polarity, + &ts.tv_sec); } static EXT_ATTR_RW(signal, signal, 0); static EXT_ATTR_RW(signal, signal, 1);