Skip to contentSkip to conversation

staging: comedi: Using macro DIV_ROUND_UP

PATCH In review simran singhal 2 participants 2 messages Feb 21, 2017 – Mar 8, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 6/6 staging: comedi: Using macro DIV_ROUND_UP

The macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /(d)). It clarifies the divisor calculations. This occurence was detected using the coccinelle script:

@@
expression e1;
expression e2;
@@
(
- ((e1) + e2 - 1) / (e2)
+ DIV_ROUND_UP(e1,e2)
|
- ((e1) + (e2 - 1)) / (e2)
+ DIV_ROUND_UP(e1,e2)
)

---
 drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/comedi/drivers/addi_apci_3xxx.c +1 -1
index b6af3eb..82c2211 100644
@@ -502,7 +502,7 @@ static int apci3xxx_ai_ns_to_timer(struct comedi_device *dev,
 			timer = *ns / base;
 			break;
 		case CMDF_ROUND_UP:
-			timer = (*ns + base - 1) / base;
+			timer = DIV_ROUND_UP(*ns, base);
 			break;
 		}
 
drivers/staging/comedi/drivers/cb_pcidas64.c +1 -1
index efbf277..3b98193 100644
@@ -2007,7 +2007,7 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags)
 
 	switch (flags & CMDF_ROUND_MASK) {
 	case CMDF_ROUND_UP:
-		divisor = (ns + TIMER_BASE - 1) / TIMER_BASE;
+		divisor = DIV_ROUND_UP(ns, TIMER_BASE);
 		break;
 	case CMDF_ROUND_DOWN:
 		divisor = ns / TIMER_BASE;
Signature · 1 line
2.7.4
Reviewed-by on v1 6/6
#1 lore raw
Quoted 41 lines · simran singhal

The macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /(d)). It clarifies the divisor calculations. This occurence was detected using the coccinelle script:

@@
expression e1;
expression e2;
@@
(
- ((e1) + e2 - 1) / (e2)
+ DIV_ROUND_UP(e1,e2)
|
- ((e1) + (e2 - 1)) / (e2)
+ DIV_ROUND_UP(e1,e2)
)

---
 drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/comedi/drivers/addi_apci_3xxx.c +1 -1
index b6af3eb..82c2211 100644
@@ -502,7 +502,7 @@ static int apci3xxx_ai_ns_to_timer(struct comedi_device *dev,
 			timer = *ns / base;
 			break;
 		case CMDF_ROUND_UP:
-			timer = (*ns + base - 1) / base;
+			timer = DIV_ROUND_UP(*ns, base);
 			break;
 		}
 
drivers/staging/comedi/drivers/cb_pcidas64.c +0 -0
index efbf277..3b98193 100644

drivers/staging/comedi/drivers/cb_pcidas64.c static unsigned int get_divisor(unsigned int ns, unsigned int flags) · line 2013

Quoted 8 lines
drivers/staging/comedi/drivers/cb_pcidas64.c +1 -1
@@ -2007,7 +2007,7 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags)
 
 	switch (flags & CMDF_ROUND_MASK) {
 	case CMDF_ROUND_UP:
-		divisor = (ns + TIMER_BASE - 1) / TIMER_BASE;
+		divisor = DIV_ROUND_UP(ns, TIMER_BASE);
 		break;
 	case CMDF_ROUND_DOWN:
 		divisor = ns / TIMER_BASE;

Thanks. Ideally, this should be split into two patches, one for each driver module, but I guess we can live with a single patch. (I don't know about the other 5 patches in this series.)

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]> )=-
-=(                          Web: http://www.mev.co.uk/  )=-