Skip to contentSkip to conversation

staging: most: Using macro DIV_ROUND_UP

PATCH Superseded simran singhal 2 participants 4 messages Feb 21, 2017 – Feb 22, 2017

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/7 staging: most: 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/most/hdm-dim2/dim2_hal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/most/hdm-dim2/dim2_hal.c +3 -3
index 0b9816c..6824826 100644
@@ -49,7 +49,7 @@
 #define DBR_SIZE  (16 * 1024) /* specified by IP */
 #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE)
 
-#define ROUND_UP_TO(x, d)  (((x) + (d) - 1) / (d) * (d))
+#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d))
 
 /* -------------------------------------------------------------------------- */
 /* generic helper functions and macros */
@@ -117,7 +117,7 @@ static int alloc_dbr(u16 size)
 		return DBR_SIZE; /* out of memory */
 
 	for (i = 0; i < DBR_MAP_SIZE; i++) {
-		u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+		u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 		u32 mask = ~((~(u32)0) << blocks);
 
 		do {
@@ -137,7 +137,7 @@ static int alloc_dbr(u16 size)
 static void free_dbr(int offs, int size)
 {
 	int block_idx = offs / DBR_BLOCK_SIZE;
-	u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+	u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 	u32 mask = ~((~(u32)0) << blocks);
 
 	mask <<= block_idx % 32;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 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:

Quoted 11 lines

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

DIV_ROUND_UP is defined in kernel.h, which defines some other generally useful things. Maybe there is an opportunity for making rules from some of them also.

julia

Quoted 47 lines
---
 drivers/staging/most/hdm-dim2/dim2_hal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/most/hdm-dim2/dim2_hal.c +3 -4
index 0b9816c..6824826 100644
@@ -49,7 +49,7 @@
 #define DBR_SIZE  (16 * 1024) /* specified by IP */
 #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE)
 
-#define ROUND_UP_TO(x, d)  (((x) + (d) - 1) / (d) * (d))
+#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d))
 
 /* -------------------------------------------------------------------------- */
 /* generic helper functions and macros */
@@ -117,7 +117,7 @@ static int alloc_dbr(u16 size)
 		return DBR_SIZE; /* out of memory */
 
 	for (i = 0; i < DBR_MAP_SIZE; i++) {
-		u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+		u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 		u32 mask = ~((~(u32)0) << blocks);
 
 		do {
@@ -137,7 +137,7 @@ static int alloc_dbr(u16 size)
 static void free_dbr(int offs, int size)
 {
 	int block_idx = offs / DBR_BLOCK_SIZE;
-	u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+	u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 	u32 mask = ~((~(u32)0) << blocks);
 
 	mask <<= block_idx % 32;
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170221185615.GA25627%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 22 lines · Julia Lawall
Quoted 4 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:

Quoted 11 lines

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

Quoted 4 lines

DIV_ROUND_UP is defined in kernel.h, which defines some other generally useful things. Maybe there is an opportunity for making rules from some of them also.

yes, for sure I will make other rules also, but do I have to include other rules in
this patch only and resend v2.

Quoted 59 lines

julia

Review

Quoted 7 lines

---

 drivers/staging/most/hdm-dim2/dim2_hal.c | 6 +++--- 
 1 file changed, 3 insertions(+), 3 deletions(-) 
(quoted diff) +0 -0

b/drivers/staging/most/hdm-dim2/dim2_hal.c

drivers/staging/most/hdm-dim2/dim2_hal.c line 54

Quoted 11 lines

index 0b9816c..6824826 100644

drivers/staging/most/hdm-dim2/dim2_hal.c +1 -1
@@ -49,7 +49,7 @@ 
 #define DBR_SIZE  (16 * 1024) /* specified by IP */ 
 #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE) 
 
-#define ROUND_UP_TO(x, d)  (((x) + (d) - 1) / (d) * (d)) 
+#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d)) 
 
 /* 

--------------------------------------------------------------------------
*/

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 120

Quoted 6 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +0 -1
 /* generic helper functions and macros */ 
@@ -117,7 +117,7 @@ static int alloc_dbr(u16 size) 
                 return DBR_SIZE; /* out of memory */ 
 
         for (i = 0; i < DBR_MAP_SIZE; i++) { 
-                u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / 

DBR_BLOCK_SIZE;

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 140

Quoted 9 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -1
+                u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE); 
                 u32 mask = ~((~(u32)0) << blocks); 
 
                 do { 
@@ -137,7 +137,7 @@ static int alloc_dbr(u16 size) 
 static void free_dbr(int offs, int size) 
 { 
         int block_idx = offs / DBR_BLOCK_SIZE; 
-        u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / 

DBR_BLOCK_SIZE;

Quoted 9 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -0
+        u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE); 
         u32 mask = ~((~(u32)0) << blocks); 
 
         mask <<= block_idx % 32; 
Signature · 4 lines
2.7.4 

-- 
You received this message because you are subscribed to the Google 

Groups "outreachy-kernel" group.

Quoted 1 line

To unsubscribe from this group and stop receiving emails from it, send

an email to [email protected].

Quoted 2 lines

To post to this group, send email to [email protected]. To view this discussion on the web visit

https://groups.google.com/d/msgid/outreachy-kernel/20170221185615.GA25627%40singhal-Inspiron-5558.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

#3 lore raw
Quoted 33 lines · SIMRAN SINGHAL

On Wednesday, February 22, 2017 at 1:28:52 AM UTC+5:30, Julia Lawall wrote:

      On Wed, 22 Feb 2017, simran singhal wrote:

      > 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)
      > )


      DIV_ROUND_UP is defined in kernel.h, which defines some other
      generally
      useful things.  Maybe there is an opportunity for making rules
      from some
      of them also.
Quoted 3 lines

yes, for sure I will make other rules also, but do I have to include other rules in
this patch only and resend v2.

It was just a suggestion for future work, not a complaint about this patch :)

julia

Quoted 74 lines

      julia

      >
      > Signed-off-by: simran singhal <[email protected]>
      > ---
      >  drivers/staging/most/hdm-dim2/dim2_hal.c | 6 +++---
      >  1 file changed, 3 insertions(+), 3 deletions(-)
      >
      > diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c
      b/drivers/staging/most/hdm-dim2/dim2_hal.c
      > index 0b9816c..6824826 100644
      > --- a/drivers/staging/most/hdm-dim2/dim2_hal.c
      > +++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
      > @@ -49,7 +49,7 @@
      >  #define DBR_SIZE  (16 * 1024) /* specified by IP */
      >  #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE)
      >
      > -#define ROUND_UP_TO(x, d)  (((x) + (d) - 1) / (d) * (d))
      > +#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d))
      >
      >  /*
      --------------------------------------------------------------------------
      */
      >  /* generic helper functions and macros */
      > @@ -117,7 +117,7 @@ static int alloc_dbr(u16 size)
      >                  return DBR_SIZE; /* out of memory */
      >
      >          for (i = 0; i < DBR_MAP_SIZE; i++) {
      > -                u32 const blocks = (size + DBR_BLOCK_SIZE -
      1) / DBR_BLOCK_SIZE;
      > +                u32 const blocks = DIV_ROUND_UP(size,
      DBR_BLOCK_SIZE);
      >                  u32 mask = ~((~(u32)0) << blocks);
      >
      >                  do {
      > @@ -137,7 +137,7 @@ static int alloc_dbr(u16 size)
      >  static void free_dbr(int offs, int size)
      >  {
      >          int block_idx = offs / DBR_BLOCK_SIZE;
      > -        u32 const blocks = (size + DBR_BLOCK_SIZE - 1) /
      DBR_BLOCK_SIZE;
      > +        u32 const blocks = DIV_ROUND_UP(size,
      DBR_BLOCK_SIZE);
      >          u32 mask = ~((~(u32)0) << blocks);
      >
      >          mask <<= block_idx % 32;
      > --
      > 2.7.4
      >
      > --
      > You received this message because you are subscribed to the
      Google Groups "outreachy-kernel" group.
      > To unsubscribe from this group and stop receiving emails from
      it, send an email to [email protected].
      > To post to this group, send email to
      [email protected].
      > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/20170221185615.GA25627%4
      0singhal-Inspiron-5558.
      > For more options, visit https://groups.google.com/d/optout.
      >

--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/e9a638db-16fe-4e85-a132- c45c39307df1%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.