[PATCHv3 10/16] pps: use BUG_ON for kernel API safety checks

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Alexander Gordeev
Date: Wednesday, August 4, 2010 - 2:06 pm

This way less overhead is involved when running production kernel.
If you want to debug a pps client module please define DEBUG to enable
the checks.

Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
---
 drivers/pps/kapi.c |   33 ++++++++++-----------------------
 1 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index 8c557c4..220ab08 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -80,25 +80,14 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
 	int err;
 
 	/* Sanity checks */
-	if ((info->mode & default_params) != default_params) {
-		pr_err("pps: %s: unsupported default parameters\n",
-					info->name);
-		err = -EINVAL;
-		goto pps_register_source_exit;
-	}
-	if ((info->mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) != 0 &&
-			info->echo == NULL) {
-		pr_err("pps: %s: echo function is not defined\n",
-					info->name);
-		err = -EINVAL;
-		goto pps_register_source_exit;
-	}
-	if ((info->mode & (PPS_TSFMT_TSPEC | PPS_TSFMT_NTPFP)) == 0) {
-		pr_err("pps: %s: unspecified time format\n",
-					info->name);
-		err = -EINVAL;
-		goto pps_register_source_exit;
-	}
+
+	/* default_params should be supported */
+	BUG_ON((info->mode & default_params) != default_params);
+	/* echo function should be defined if we are asked to call it */
+	BUG_ON((info->mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) != 0 &&
+			info->echo == NULL);
+	/* time format should be specified */
+	BUG_ON((info->mode & (PPS_TSFMT_TSPEC | PPS_TSFMT_NTPFP)) == 0);
 
 	/* Allocate memory for the new PPS source struct */
 	pps = kzalloc(sizeof(struct pps_device), GFP_KERNEL);
@@ -175,10 +164,8 @@ void pps_event(struct pps_device *pps, struct pps_event_time *ts, int event,
 	int captured = 0;
 	struct pps_ktime ts_real;
 
-	if ((event & (PPS_CAPTUREASSERT | PPS_CAPTURECLEAR)) == 0) {
-		dev_err(pps->dev, "unknown event (%x)\n", event);
-		return;
-	}
+	/* check event type */
+	BUG_ON((event & (PPS_CAPTUREASSERT | PPS_CAPTURECLEAR)) == 0);
 
 	dev_dbg(pps->dev, "PPS event at %ld.%09ld\n",
 			ts->ts_real.tv_sec, ts->ts_real.tv_nsec);
-- 
1.7.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCHv3 00/16] pps: several fixes and improvements, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 01/16] pps: trivial fixes, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 04/16] pps: unify timestamp gathering, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 06/16] pps: convert printk/pr_* to dev_*, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 07/16] pps: move idr stuff to pps.c, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 08/16] pps: add async PPS event handler, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 10/16] pps: use BUG_ON for kernel API safety checks, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 11/16] pps: simplify conditions a bit, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 13/16] pps: capture MONOTONIC_RAW timestamps as well, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 14/16] pps: add kernel consumer support, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 15/16] pps: add parallel port PPS client, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
[PATCHv3 16/16] pps: add parallel port PPS signal generator, Alexander Gordeev, (Wed Aug 4, 2:06 pm)
Re: [PATCHv3 15/16] pps: add parallel port PPS client, Andrew Morton, (Wed Aug 4, 4:34 pm)
Re: [PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Vitezslav Samel, (Wed Aug 4, 10:19 pm)
Re: [PATCHv3 01/16] pps: trivial fixes, Rodolfo Giometti, (Thu Aug 5, 1:57 am)
Re: [PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Rodolfo Giometti, (Thu Aug 5, 2:15 am)
Re: [PATCHv3 04/16] pps: unify timestamp gathering, Rodolfo Giometti, (Thu Aug 5, 2:17 am)
Re: [PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Alexander Gordeev, (Thu Aug 5, 3:19 am)
Re: [PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Vitezslav Samel, (Thu Aug 5, 4:07 am)
Re: [PATCHv3 13/16] pps: capture MONOTONIC_RAW timestamps ..., Alexander Gordeev, (Thu Aug 5, 5:16 am)
Re: [PATCHv3 13/16] pps: capture MONOTONIC_RAW timestamps ..., Alexander Gordeev, (Thu Aug 5, 5:29 am)
Re: [PATCHv3 15/16] pps: add parallel port PPS client, Alexander Gordeev, (Thu Aug 5, 5:48 am)
Re: [PATCHv3 03/16] pps: fix race in PPS_FETCH handler, Alexander Gordeev, (Thu Aug 5, 7:31 am)