All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Staging: comedi: Use DIV_ROUND_CLOSEST
@ 2016-02-26  6:24 Bhumika Goyal
  2016-02-26  6:43 ` [Outreachy kernel] " Greg KH
  2016-02-26  7:12 ` [RESEND PATCH] " Bhumika Goyal
  0 siblings, 2 replies; 4+ messages in thread
From: Bhumika Goyal @ 2016-02-26  6:24 UTC (permalink / raw)
  To: outreachy-kernel; +Cc: Bhumika Goyal

The macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d and
makes the code more readable.
Done using coccinelle:

@@
expression x,divisor;
@@
- (((x) + ((divisor) / 2)) / (divisor))
+ DIV_ROUND_CLOSEST(x,divisor)

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
---
 drivers/staging/comedi/drivers/ni_mio_common.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 1c2abb3..0df293a 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -2052,7 +2052,7 @@ static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec,
 	switch (flags & CMDF_ROUND_MASK) {
 	case CMDF_ROUND_NEAREST:
 	default:
-		divider = (nanosec + devpriv->clock_ns / 2) / devpriv->clock_ns;
+		divider = DIV_ROUND_CLOSEST(nanosec, devpriv->clock_ns);
 		break;
 	case CMDF_ROUND_DOWN:
 		divider = (nanosec) / devpriv->clock_ns;
@@ -4234,8 +4234,7 @@ static int ni_m_series_pwm_config(struct comedi_device *dev,
 		switch (data[1]) {
 		case CMDF_ROUND_NEAREST:
 			up_count =
-			    (data[2] +
-			     devpriv->clock_ns / 2) / devpriv->clock_ns;
+			    DIV_ROUND_CLOSEST(data[2], devpriv->clock_ns);
 			break;
 		case CMDF_ROUND_DOWN:
 			up_count = data[2] / devpriv->clock_ns;
@@ -4251,8 +4250,7 @@ static int ni_m_series_pwm_config(struct comedi_device *dev,
 		switch (data[3]) {
 		case CMDF_ROUND_NEAREST:
 			down_count =
-			    (data[4] +
-			     devpriv->clock_ns / 2) / devpriv->clock_ns;
+			    DIV_ROUND_CLOSEST(data[4], devpriv->clock_ns);
 			break;
 		case CMDF_ROUND_DOWN:
 			down_count = data[4] / devpriv->clock_ns;
@@ -4298,8 +4296,7 @@ static int ni_6143_pwm_config(struct comedi_device *dev,
 		switch (data[1]) {
 		case CMDF_ROUND_NEAREST:
 			up_count =
-			    (data[2] +
-			     devpriv->clock_ns / 2) / devpriv->clock_ns;
+			    DIV_ROUND_CLOSEST(data[2], devpriv->clock_ns);
 			break;
 		case CMDF_ROUND_DOWN:
 			up_count = data[2] / devpriv->clock_ns;
@@ -4315,8 +4312,7 @@ static int ni_6143_pwm_config(struct comedi_device *dev,
 		switch (data[3]) {
 		case CMDF_ROUND_NEAREST:
 			down_count =
-			    (data[4] +
-			     devpriv->clock_ns / 2) / devpriv->clock_ns;
+			    DIV_ROUND_CLOSEST(data[4], devpriv->clock_ns);
 			break;
 		case CMDF_ROUND_DOWN:
 			down_count = data[4] / devpriv->clock_ns;
@@ -4919,8 +4915,8 @@ static int ni_mseries_get_pll_parameters(unsigned reference_period_ns,
 	*freq_divider = best_div;
 	*freq_multiplier = best_mult;
 	*actual_period_ns =
-	    (best_period_picosec * fudge_factor_80_to_20Mhz +
-	     (pico_per_nano / 2)) / pico_per_nano;
+	    DIV_ROUND_CLOSEST(best_period_picosec * fudge_factor_80_to_20Mhz,
+			      pico_per_nano);
 	return 0;
 }
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-05 22:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-26  6:24 [PATCH] Staging: comedi: Use DIV_ROUND_CLOSEST Bhumika Goyal
2016-02-26  6:43 ` [Outreachy kernel] " Greg KH
2016-02-26  7:12 ` [RESEND PATCH] " Bhumika Goyal
2016-03-05 22:55   ` [Outreachy kernel] " Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.