linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Richard Cochran <richardcochran@gmail.com>, netdev@vger.kernel.org
Subject: [patch 01/13] ptp: Split out PTP_CLOCK_GETCAPS ioctl code
Date: Fri, 20 Jun 2025 15:24:27 +0200 (CEST)	[thread overview]
Message-ID: <20250620131943.779603403@linutronix.de> (raw)
In-Reply-To: 20250620130144.351492917@linutronix.de

ptp_ioctl() is an inpenetrable letter soup with a gazillion of case (scope)
specific variables defined at the top of the function and pointless breaks
and gotos.

Start cleaning it up by splitting out the PTP_CLOCK_GETCAPS ioctl code into
a helper function. Use a argument pointer with a single sparse compliant
type cast instead of proliferating the type cast all over the place.

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/ptp/ptp_chardev.c |   41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -157,6 +157,26 @@ int ptp_release(struct posix_clock_conte
 	return 0;
 }
 
+static long ptp_clock_getcaps(struct ptp_clock *ptp, void __user *arg)
+{
+	struct ptp_clock_caps caps = {
+		.max_adj		= ptp->info->max_adj,
+		.n_alarm		= ptp->info->n_alarm,
+		.n_ext_ts		= ptp->info->n_ext_ts,
+		.n_per_out		= ptp->info->n_per_out,
+		.pps			= ptp->info->pps,
+		.n_pins			= ptp->info->n_pins,
+		.cross_timestamping	= ptp->info->getcrosststamp != NULL,
+		.adjust_phase		= ptp->info->adjphase != NULL &&
+					  ptp->info->getmaxphase != NULL,
+	};
+
+	if (caps.adjust_phase)
+		caps.max_phase_adj = ptp->info->getmaxphase(ptp->info);
+
+	return copy_to_user(arg, &caps, sizeof(caps)) ? -EFAULT : 0;
+}
+
 long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
 	       unsigned long arg)
 {
@@ -171,37 +191,22 @@ long ptp_ioctl(struct posix_clock_contex
 	struct timestamp_event_queue *tsevq;
 	struct ptp_system_timestamp sts;
 	struct ptp_clock_request req;
-	struct ptp_clock_caps caps;
 	struct ptp_clock_time *pct;
 	struct ptp_pin_desc pd;
 	struct timespec64 ts;
 	int enable, err = 0;
+	void __user *argptr;
 
 	if (in_compat_syscall() && cmd != PTP_ENABLE_PPS && cmd != PTP_ENABLE_PPS2)
 		arg = (unsigned long)compat_ptr(arg);
+	argptr = (void __force __user *)arg;
 
 	tsevq = pccontext->private_clkdata;
 
 	switch (cmd) {
-
 	case PTP_CLOCK_GETCAPS:
 	case PTP_CLOCK_GETCAPS2:
-		memset(&caps, 0, sizeof(caps));
-
-		caps.max_adj = ptp->info->max_adj;
-		caps.n_alarm = ptp->info->n_alarm;
-		caps.n_ext_ts = ptp->info->n_ext_ts;
-		caps.n_per_out = ptp->info->n_per_out;
-		caps.pps = ptp->info->pps;
-		caps.n_pins = ptp->info->n_pins;
-		caps.cross_timestamping = ptp->info->getcrosststamp != NULL;
-		caps.adjust_phase = ptp->info->adjphase != NULL &&
-				    ptp->info->getmaxphase != NULL;
-		if (caps.adjust_phase)
-			caps.max_phase_adj = ptp->info->getmaxphase(ptp->info);
-		if (copy_to_user((void __user *)arg, &caps, sizeof(caps)))
-			err = -EFAULT;
-		break;
+		return ptp_clock_getcaps(ptp, argptr);
 
 	case PTP_EXTTS_REQUEST:
 	case PTP_EXTTS_REQUEST2:


  reply	other threads:[~2025-06-20 13:24 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-20 13:24 [patch 00/13] ptp: Belated spring cleaning of the chardev driver Thomas Gleixner
2025-06-20 13:24 ` Thomas Gleixner [this message]
2025-06-21 20:22   ` [patch 01/13] ptp: Split out PTP_CLOCK_GETCAPS ioctl code Vadim Fedorenko
2025-06-20 13:24 ` [patch 02/13] ptp: Split out PTP_EXTTS_REQUEST " Thomas Gleixner
2025-06-21 20:24   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 03/13] ptp: Split out PTP_PEROUT_REQUEST " Thomas Gleixner
2025-06-21 20:24   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 04/13] ptp: Split out PTP_ENABLE_PPS " Thomas Gleixner
2025-06-21 20:25   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 05/13] ptp: Split out PTP_SYS_OFFSET_PRECISE " Thomas Gleixner
2025-06-21 20:27   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 06/13] ptp: Split out PTP_SYS_OFFSET_EXTENDED " Thomas Gleixner
2025-06-21 20:29   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 07/13] ptp: Split out PTP_SYS_OFFSET " Thomas Gleixner
2025-06-21 20:14   ` Vadim Fedorenko
2025-06-21 20:42     ` Thomas Gleixner
2025-06-21 20:58       ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 08/13] ptp: Split out PTP_PIN_GETFUNC " Thomas Gleixner
2025-06-21 20:29   ` Vadim Fedorenko
2025-06-24  9:22   ` Paolo Abeni
2025-06-24 13:39     ` Thomas Gleixner
2025-06-25  8:19       ` Thomas Gleixner
2025-06-20 13:24 ` [patch 09/13] ptp: Split out PTP_PIN_SETFUNC " Thomas Gleixner
2025-06-21 20:30   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 10/13] ptp: Split out PTP_MASK_CLEAR_ALL " Thomas Gleixner
2025-06-21 20:36   ` Vadim Fedorenko
2025-06-21 20:44     ` Thomas Gleixner
2025-06-21 20:59       ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 11/13] ptp: Split out PTP_MASK_EN_SINGLE " Thomas Gleixner
2025-06-21 20:32   ` Vadim Fedorenko
2025-06-20 13:24 ` [patch 12/13] ptp: Convert chardev code to lock guards Thomas Gleixner
2025-06-20 13:24 ` [patch 13/13] ptp: Convert ptp_open/read() to __free() Thomas Gleixner
2025-06-24  9:48   ` Paolo Abeni
2025-06-24 13:38     ` Thomas Gleixner
2025-06-24 16:36   ` Jakub Kicinski
2025-06-25 10:33     ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250620131943.779603403@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=richardcochran@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).