]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ptp: Split out PTP_SYS_OFFSET_PRECISE ioctl code
authorThomas Gleixner <tglx@linutronix.de>
Wed, 25 Jun 2025 11:52:29 +0000 (13:52 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 27 Jun 2025 00:54:04 +0000 (17:54 -0700)
Continue the ptp_ioctl() cleanup by splitting out the PTP_SYS_OFFSET_PRECISE
ioctl code into a helper function.

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20250625115132.986897454@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_chardev.c

index 740987e14244abc4d3c8aacfea3fdaee6a7adca9..9a4036dcbc2d62dfa12938865bc25667729cdb36 100644 (file)
@@ -290,14 +290,40 @@ static long ptp_enable_pps(struct ptp_clock *ptp, bool enable)
                return ops->enable(ops, &req, enable);
 }
 
+static long ptp_sys_offset_precise(struct ptp_clock *ptp, void __user *arg)
+{
+       struct ptp_sys_offset_precise precise_offset;
+       struct system_device_crosststamp xtstamp;
+       struct timespec64 ts;
+       int err;
+
+       if (!ptp->info->getcrosststamp)
+               return -EOPNOTSUPP;
+
+       err = ptp->info->getcrosststamp(ptp->info, &xtstamp);
+       if (err)
+               return err;
+
+       memset(&precise_offset, 0, sizeof(precise_offset));
+       ts = ktime_to_timespec64(xtstamp.device);
+       precise_offset.device.sec = ts.tv_sec;
+       precise_offset.device.nsec = ts.tv_nsec;
+       ts = ktime_to_timespec64(xtstamp.sys_realtime);
+       precise_offset.sys_realtime.sec = ts.tv_sec;
+       precise_offset.sys_realtime.nsec = ts.tv_nsec;
+       ts = ktime_to_timespec64(xtstamp.sys_monoraw);
+       precise_offset.sys_monoraw.sec = ts.tv_sec;
+       precise_offset.sys_monoraw.nsec = ts.tv_nsec;
+
+       return copy_to_user(arg, &precise_offset, sizeof(precise_offset)) ? -EFAULT : 0;
+}
+
 long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
               unsigned long arg)
 {
        struct ptp_clock *ptp =
                container_of(pccontext->clk, struct ptp_clock, clock);
        struct ptp_sys_offset_extended *extoff = NULL;
-       struct ptp_sys_offset_precise precise_offset;
-       struct system_device_crosststamp xtstamp;
        struct ptp_clock_info *ops = ptp->info;
        struct ptp_sys_offset *sysoff = NULL;
        struct timestamp_event_queue *tsevq;
@@ -340,28 +366,7 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
 
        case PTP_SYS_OFFSET_PRECISE:
        case PTP_SYS_OFFSET_PRECISE2:
-               if (!ptp->info->getcrosststamp) {
-                       err = -EOPNOTSUPP;
-                       break;
-               }
-               err = ptp->info->getcrosststamp(ptp->info, &xtstamp);
-               if (err)
-                       break;
-
-               memset(&precise_offset, 0, sizeof(precise_offset));
-               ts = ktime_to_timespec64(xtstamp.device);
-               precise_offset.device.sec = ts.tv_sec;
-               precise_offset.device.nsec = ts.tv_nsec;
-               ts = ktime_to_timespec64(xtstamp.sys_realtime);
-               precise_offset.sys_realtime.sec = ts.tv_sec;
-               precise_offset.sys_realtime.nsec = ts.tv_nsec;
-               ts = ktime_to_timespec64(xtstamp.sys_monoraw);
-               precise_offset.sys_monoraw.sec = ts.tv_sec;
-               precise_offset.sys_monoraw.nsec = ts.tv_nsec;
-               if (copy_to_user((void __user *)arg, &precise_offset,
-                                sizeof(precise_offset)))
-                       err = -EFAULT;
-               break;
+               return ptp_sys_offset_precise(ptp, argptr);
 
        case PTP_SYS_OFFSET_EXTENDED:
        case PTP_SYS_OFFSET_EXTENDED2: