]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ptp: ocp: Refactor signal_show() and fix %ptT misuse
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 24 Nov 2025 08:45:45 +0000 (09:45 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 26 Nov 2025 03:17:21 +0000 (19:17 -0800)
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 <vadim.fedorenko@linux.dev>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20251124084816.205035-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_ocp.c

index eeebe4d149f71ed4b5a64b107086cff1c3be54bd..95889f85ffb26650e3726c013c6d71da5127e001 100644 (file)
@@ -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);