[PATCH net-next v1 1/7] ptp: ocp: Refactor signal_show() and fix %ptT misuse

Andy Shevchenko posted 7 patches 2 months, 4 weeks ago
There is a newer version of this series
[PATCH net-next v1 1/7] ptp: ocp: Refactor signal_show() and fix %ptT misuse
Posted by Andy Shevchenko 2 months, 4 weeks ago
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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/ptp/ptp_ocp.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index eeebe4d149f7..95889f85ffb2 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);
-- 
2.50.1
Re: [PATCH net-next v1 1/7] ptp: ocp: Refactor signal_show() and fix %ptT misuse
Posted by Vadim Fedorenko 2 months, 3 weeks ago
On 11/11/2025 16:52, Andy Shevchenko wrote:
> 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.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>   drivers/ptp/ptp_ocp.c | 14 +++++---------
>   1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
> index eeebe4d149f7..95889f85ffb2 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);

Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>