Skip to contentSkip to conversation

staging: sm750fb: Code readability is improved

PATCH Superseded Arushi Singhal 2 participants 4 messages Mar 19, 2017 – Mar 20, 2017

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 staging: sm750fb: Code readability is improved

New variables are added to make the code more readable.

---
changes in v4
-try to make the code much more readable.
- defined the variable at the top of a block.

---
 drivers/staging/sm750fb/ddk750_mode.c | 57 +++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 26 deletions(-)
drivers/staging/sm750fb/ddk750_mode.c +31 -26
index eea5aef2956f..6517e770e0a7 100644
@@ -76,38 +76,43 @@ static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value *
 {
 	int ret = 0;
 	int cnt = 0;
-	unsigned int tmp, reg;
+	unsigned int tmp, reg, temp;
 
 	if (pll->clockType == SECONDARY_PLL) {
 		/* programe secondary pixel clock */
 		poke32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));
-		poke32(CRT_HORIZONTAL_TOTAL,
-		       (((pModeParam->horizontal_total - 1) <<
-			 CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
-			CRT_HORIZONTAL_TOTAL_TOTAL_MASK) |
-		       ((pModeParam->horizontal_display_end - 1) &
-			CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK));
-
-		poke32(CRT_HORIZONTAL_SYNC,
-		       ((pModeParam->horizontal_sync_width <<
-			 CRT_HORIZONTAL_SYNC_WIDTH_SHIFT) &
-			CRT_HORIZONTAL_SYNC_WIDTH_MASK) |
-		       ((pModeParam->horizontal_sync_start - 1) &
-			CRT_HORIZONTAL_SYNC_START_MASK));
 
-		poke32(CRT_VERTICAL_TOTAL,
-		       (((pModeParam->vertical_total - 1) <<
-			 CRT_VERTICAL_TOTAL_TOTAL_SHIFT) &
-			CRT_VERTICAL_TOTAL_TOTAL_MASK) |
-		       ((pModeParam->vertical_display_end - 1) &
-			CRT_VERTICAL_TOTAL_DISPLAY_END_MASK));
+		temp = (pModeParam->horizontal_total - 1) <<
+				CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT;
+		temp = temp & CRT_HORIZONTAL_TOTAL_TOTAL_MASK;
+		temp = temp | ((pModeParam->horizontal_display_end - 1) &
+				CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK);
 
-		poke32(CRT_VERTICAL_SYNC,
-		       ((pModeParam->vertical_sync_height <<
-			 CRT_VERTICAL_SYNC_HEIGHT_SHIFT) &
-			CRT_VERTICAL_SYNC_HEIGHT_MASK) |
-		       ((pModeParam->vertical_sync_start - 1) &
-			CRT_VERTICAL_SYNC_START_MASK));
+		poke32(CRT_HORIZONTAL_TOTAL, temp);
+
+		temp = (pModeParam->horizontal_sync_width <<
+				CRT_HORIZONTAL_SYNC_WIDTH_SHIFT);
+		temp = temp & CRT_HORIZONTAL_SYNC_WIDTH_MASK;
+		temp = temp | ((pModeParam->horizontal_sync_start - 1) &
+				CRT_HORIZONTAL_SYNC_START_MASK);
+
+		poke32(CRT_HORIZONTAL_SYNC, temp);
+
+		temp = (pModeParam->vertical_total - 1) <<
+				CRT_VERTICAL_TOTAL_TOTAL_SHIFT;
+		temp = temp & CRT_VERTICAL_TOTAL_TOTAL_MASK;
+		temp = temp | ((pModeParam->vertical_display_end - 1) &
+			       CRT_VERTICAL_TOTAL_DISPLAY_END_MASK);
+
+		poke32(CRT_VERTICAL_TOTAL, temp);
+
+		temp = pModeParam->vertical_sync_height <<
+				CRT_VERTICAL_SYNC_HEIGHT_SHIFT;
+		temp = temp & CRT_VERTICAL_SYNC_HEIGHT_MASK;
+		temp = temp | ((pModeParam->vertical_sync_start - 1) &
+			       CRT_VERTICAL_SYNC_START_MASK);
+
+		poke32(CRT_VERTICAL_SYNC, temp);
 
 		tmp = DISPLAY_CTRL_TIMING | DISPLAY_CTRL_PLANE;
 		if (pModeParam->vertical_sync_polarity)
Signature · 1 line
2.11.0
#1 lore raw
Quoted 16 lines · Arushi Singhal

New variables are added to make the code more readable.

---
changes in v4
-try to make the code much more readable.
- defined the variable at the top of a block.

---
 drivers/staging/sm750fb/ddk750_mode.c | 57 +++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 26 deletions(-)
drivers/staging/sm750fb/ddk750_mode.c +0 -0
index eea5aef2956f..6517e770e0a7 100644

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 79

Quoted 5 lines
drivers/staging/sm750fb/ddk750_mode.c +1 -1
@@ -76,38 +76,43 @@ static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value *
 {
 	int ret = 0;
 	int cnt = 0;
-	unsigned int tmp, reg;
+	unsigned int tmp, reg, temp;

Let's not have "tmp" and "temp" both. Generally "tmp" is better because you can't confuse it with temperature.

Quoted 17 lines
drivers/staging/sm750fb/ddk750_mode.c +0 -13
 	if (pll->clockType = SECONDARY_PLL) {
 		/* programe secondary pixel clock */
 		poke32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));
-		poke32(CRT_HORIZONTAL_TOTAL,
-		       (((pModeParam->horizontal_total - 1) <<
-			 CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
-			CRT_HORIZONTAL_TOTAL_TOTAL_MASK) |
-		       ((pModeParam->horizontal_display_end - 1) &
-			CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK));
-
-		poke32(CRT_HORIZONTAL_SYNC,
-		       ((pModeParam->horizontal_sync_width <<
-			 CRT_HORIZONTAL_SYNC_WIDTH_SHIFT) &
-			CRT_HORIZONTAL_SYNC_WIDTH_MASK) |
-		       ((pModeParam->horizontal_sync_start - 1) &
-			CRT_HORIZONTAL_SYNC_START_MASK));

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 87

Quoted 10 lines
drivers/staging/sm750fb/ddk750_mode.c +3 -6
 
-		poke32(CRT_VERTICAL_TOTAL,
-		       (((pModeParam->vertical_total - 1) <<
-			 CRT_VERTICAL_TOTAL_TOTAL_SHIFT) &
-			CRT_VERTICAL_TOTAL_TOTAL_MASK) |
-		       ((pModeParam->vertical_display_end - 1) &
-			CRT_VERTICAL_TOTAL_DISPLAY_END_MASK));
+		temp = (pModeParam->horizontal_total - 1) <<
+				CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT;
+		temp = temp & CRT_HORIZONTAL_TOTAL_TOTAL_MASK;

These two lines are really part of the same thing and they should be done together.

		tmp = ((pModeParam->horizontal_total - 1) <<
		       CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
		      CRT_HORIZONTAL_TOTAL_TOTAL_MASK;

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 89

Quoted 2 lines
drivers/staging/sm750fb/ddk750_mode.c +2 -0
+		temp = temp | ((pModeParam->horizontal_display_end - 1) &
+				CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK);
		tmp |= (pModeParam->horizontal_display_end - 1) &
		       CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK;

Use |=. Remove the extra parenthesis.

regards,
dan carpenter

#2 lore raw
Quoted 20 lines · Dan Carpenter
Quoted 9 lines · Arushi Singhal

New variables are added to make the code more readable.

---
changes in v4
-try to make the code much more readable.
- defined the variable at the top of a block.

---
 drivers/staging/sm750fb/ddk750_mode.c | 57

+++++++++++++++++++----------------

Review

Quoted 3 lines
 1 file changed, 31 insertions(+), 26 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/sm750fb/ddk750_mode.c

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t

Quoted 4 lines

index eea5aef2956f..6517e770e0a7 100644

drivers/staging/sm750fb/ddk750_mode.c +0 -0
@@ -76,38 +76,43 @@ static int programModeRegisters(mode_parameter_t

*pModeParam, struct pll_value *

Quoted 9 lines

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 79

Quoted 5 lines
drivers/staging/sm750fb/ddk750_mode.c +1 -1
 {
      int ret = 0;
      int cnt = 0;
-     unsigned int tmp, reg;
+     unsigned int tmp, reg, temp;

Let's not have "tmp" and "temp" both. Generally "tmp" is better because you can't confuse it with temperature.

Hi Dan
I have not added the tmp variable.
So is it good to use any other variable like "a" instead of temp. Thanks
Arushi

Quoted 49 lines
Quoted 18 lines
drivers/staging/sm750fb/ddk750_mode.c +0 -13
      if (pll->clockType == SECONDARY_PLL) {
              /* programe secondary pixel clock */
              poke32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));
-             poke32(CRT_HORIZONTAL_TOTAL,
-                    (((pModeParam->horizontal_total - 1) <<
-                      CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
-                     CRT_HORIZONTAL_TOTAL_TOTAL_MASK) |
-                    ((pModeParam->horizontal_display_end - 1) &
-                     CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK));
-
-             poke32(CRT_HORIZONTAL_SYNC,
-                    ((pModeParam->horizontal_sync_width <<
-                      CRT_HORIZONTAL_SYNC_WIDTH_SHIFT) &
-                     CRT_HORIZONTAL_SYNC_WIDTH_MASK) |
-                    ((pModeParam->horizontal_sync_start - 1) &
-                     CRT_HORIZONTAL_SYNC_START_MASK));

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 87

Quoted 10 lines
drivers/staging/sm750fb/ddk750_mode.c +3 -6
 
-             poke32(CRT_VERTICAL_TOTAL,
-                    (((pModeParam->vertical_total - 1) <<
-                      CRT_VERTICAL_TOTAL_TOTAL_SHIFT) &
-                     CRT_VERTICAL_TOTAL_TOTAL_MASK) |
-                    ((pModeParam->vertical_display_end - 1) &
-                     CRT_VERTICAL_TOTAL_DISPLAY_END_MASK));
+             temp = (pModeParam->horizontal_total - 1) <<
+                             CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT;
+             temp = temp & CRT_HORIZONTAL_TOTAL_TOTAL_MASK;

These two lines are really part of the same thing and they should be done together.

                tmp = ((pModeParam->horizontal_total - 1) <<
                       CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
                      CRT_HORIZONTAL_TOTAL_TOTAL_MASK;

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value * · line 89

Quoted 2 lines
drivers/staging/sm750fb/ddk750_mode.c +2 -0
+             temp = temp | ((pModeParam->horizontal_display_end - 1) &
+                             CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK);
                tmp |= (pModeParam->horizontal_display_end - 1) &
                       CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK;

Use |=. Remove the extra parenthesis.

regards,
dan carpenter

#3 lore raw
Quoted 29 lines · Arushi Singhal
Quoted 26 lines · Dan Carpenter
Quoted 9 lines · Arushi Singhal

New variables are added to make the code more readable.

---
changes in v4
-try to make the code much more readable.
- defined the variable at the top of a block.

---
 drivers/staging/sm750fb/ddk750_mode.c | 57

+++++++++++++++++++----------------

Review

Quoted 3 lines
 1 file changed, 31 insertions(+), 26 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/sm750fb/ddk750_mode.c

drivers/staging/sm750fb/ddk750_mode.c static int programModeRegisters(mode_parameter_t

Quoted 4 lines

index eea5aef2956f..6517e770e0a7 100644

drivers/staging/sm750fb/ddk750_mode.c +0 -0
@@ -76,38 +76,43 @@ static int programModeRegisters(mode_parameter_t

*pModeParam, struct pll_value *

Quoted 5 lines
drivers/staging/sm750fb/ddk750_mode.c +1 -1
 {
      int ret = 0;
      int cnt = 0;
-     unsigned int tmp, reg;
+     unsigned int tmp, reg, temp;
Quoted 7 lines
Quoted 3 lines

Let's not have "tmp" and "temp" both. Generally "tmp" is better because you can't confuse it with temperature.

Hi Dan
I have not added the tmp variable.
So is it good to use any other variable like "a" instead of temp.

Just re-use "tmp". No need to add "temp".

regards,
dan carpenter