Re: [PATCH] drivers/input: Macros with complex values should be enclosed in parentheses

[Dmitry Torokhov]

On Tue, Apr 26, 2016 at 10:52:50AM +0800, Rui Teng wrote:
> The bitwise shift operator has lower priority than plus operator. So the 
> values on macros
> should be enclosed in parentheses.
> 
> For example, "(1 << 4 + 1)" means "(1 << (4 + 1))", but it is not expected by 
> the macros.
> 
> And also fix other two coding style problems reported by 
> scripts/checkpatch.pl.
> 
> Signed-off-by: Rui Teng 

Applied, thank you.

> ---
>  drivers/input/keyboard/twl4030_keypad.c | 11 ++-
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/input/keyboard/twl4030_keypad.c 
> b/drivers/input/keyboard/twl4030_keypad.c
> index bbcccd6..8d061c0 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -61,9 +61,9 @@ struct twl4030_keypad {
>   unsigned short  keymap[TWL4030_KEYMAP_SIZE];
>   u16 kp_state[TWL4030_MAX_ROWS];
>   boolautorepeat;
> - unsignedn_rows;
> - unsignedn_cols;
> - unsignedirq;
> + unsigned intn_rows;
> + unsigned intn_cols;
> + unsigned intirq;
>  
>   struct device *dbg_dev;
>   struct input_dev *input;
> @@ -110,7 +110,7 @@ struct twl4030_keypad {
>  #define KEYP_CTRL_KBD_ON BIT(6)
>  
>  /* KEYP_DEB, KEYP_LONG_KEY, KEYP_TIMEOUT_x*/
> -#define KEYP_PERIOD_US(t, prescale)  ((t) / (31 << (prescale + 1)) - 1)
> +#define KEYP_PERIOD_US(t, prescale)  ((t) / (31 << ((prescale) + 1)) - 1)
>  
>  /* KEYP_LK_PTV_REG Fields */
>  #define KEYP_LK_PTV_PTV_SHIFT5
> @@ -263,7 +263,8 @@ static irqreturn_t do_kp_irq(int irq, void *_kp)
>   ret = twl4030_kpread(kp, , KEYP_ISR1, 1);
>  
>   /* Release all keys if I2C has gone bad or
> -  * the KEYP has gone to idle state */
> +  * the KEYP has gone to idle state
> +  */
>   if (ret >= 0 && (reg & KEYP_IMR1_KP))
>   twl4030_kp_scan(kp, false);
>   else
> -- 
> 2.5.0
> 

-- 
Dmitry

Re: [PATCH] drivers/input: Macros with complex values should be enclosed in parentheses

[Dmitry Torokhov]

On Tue, Apr 26, 2016 at 10:52:50AM +0800, Rui Teng wrote:
> The bitwise shift operator has lower priority than plus operator. So the 
> values on macros
> should be enclosed in parentheses.
> 
> For example, "(1 << 4 + 1)" means "(1 << (4 + 1))", but it is not expected by 
> the macros.
> 
> And also fix other two coding style problems reported by 
> scripts/checkpatch.pl.
> 
> Signed-off-by: Rui Teng 

Applied, thank you.

> ---
>  drivers/input/keyboard/twl4030_keypad.c | 11 ++-
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/input/keyboard/twl4030_keypad.c 
> b/drivers/input/keyboard/twl4030_keypad.c
> index bbcccd6..8d061c0 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -61,9 +61,9 @@ struct twl4030_keypad {
>   unsigned short  keymap[TWL4030_KEYMAP_SIZE];
>   u16 kp_state[TWL4030_MAX_ROWS];
>   boolautorepeat;
> - unsignedn_rows;
> - unsignedn_cols;
> - unsignedirq;
> + unsigned intn_rows;
> + unsigned intn_cols;
> + unsigned intirq;
>  
>   struct device *dbg_dev;
>   struct input_dev *input;
> @@ -110,7 +110,7 @@ struct twl4030_keypad {
>  #define KEYP_CTRL_KBD_ON BIT(6)
>  
>  /* KEYP_DEB, KEYP_LONG_KEY, KEYP_TIMEOUT_x*/
> -#define KEYP_PERIOD_US(t, prescale)  ((t) / (31 << (prescale + 1)) - 1)
> +#define KEYP_PERIOD_US(t, prescale)  ((t) / (31 << ((prescale) + 1)) - 1)
>  
>  /* KEYP_LK_PTV_REG Fields */
>  #define KEYP_LK_PTV_PTV_SHIFT5
> @@ -263,7 +263,8 @@ static irqreturn_t do_kp_irq(int irq, void *_kp)
>   ret = twl4030_kpread(kp, , KEYP_ISR1, 1);
>  
>   /* Release all keys if I2C has gone bad or
> -  * the KEYP has gone to idle state */
> +  * the KEYP has gone to idle state
> +  */
>   if (ret >= 0 && (reg & KEYP_IMR1_KP))
>   twl4030_kp_scan(kp, false);
>   else
> -- 
> 2.5.0
> 

-- 
Dmitry

[PATCH] drivers/input: Macros with complex values should be enclosed in parentheses

[Rui Teng]

The bitwise shift operator has lower priority than plus operator. So the values 
on macros
should be enclosed in parentheses.

For example, "(1 << 4 + 1)" means "(1 << (4 + 1))", but it is not expected by 
the macros.

And also fix other two coding style problems reported by scripts/checkpatch.pl.

Signed-off-by: Rui Teng 
---
 drivers/input/keyboard/twl4030_keypad.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/keyboard/twl4030_keypad.c 
b/drivers/input/keyboard/twl4030_keypad.c
index bbcccd6..8d061c0 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -61,9 +61,9 @@ struct twl4030_keypad {
unsigned short  keymap[TWL4030_KEYMAP_SIZE];
u16 kp_state[TWL4030_MAX_ROWS];
boolautorepeat;
-   unsignedn_rows;
-   unsignedn_cols;
-   unsignedirq;
+   unsigned intn_rows;
+   unsigned intn_cols;
+   unsigned intirq;
 
struct device *dbg_dev;
struct input_dev *input;
@@ -110,7 +110,7 @@ struct twl4030_keypad {
 #define KEYP_CTRL_KBD_ON   BIT(6)
 
 /* KEYP_DEB, KEYP_LONG_KEY, KEYP_TIMEOUT_x*/
-#define KEYP_PERIOD_US(t, prescale)((t) / (31 << (prescale + 1)) - 1)
+#define KEYP_PERIOD_US(t, prescale)((t) / (31 << ((prescale) + 1)) - 1)
 
 /* KEYP_LK_PTV_REG Fields */
 #define KEYP_LK_PTV_PTV_SHIFT  5
@@ -263,7 +263,8 @@ static irqreturn_t do_kp_irq(int irq, void *_kp)
ret = twl4030_kpread(kp, , KEYP_ISR1, 1);
 
/* Release all keys if I2C has gone bad or
-* the KEYP has gone to idle state */
+* the KEYP has gone to idle state
+*/
if (ret >= 0 && (reg & KEYP_IMR1_KP))
twl4030_kp_scan(kp, false);
else
-- 
2.5.0

[PATCH] drivers/input: Macros with complex values should be enclosed in parentheses

[Rui Teng]

The bitwise shift operator has lower priority than plus operator. So the values 
on macros
should be enclosed in parentheses.

For example, "(1 << 4 + 1)" means "(1 << (4 + 1))", but it is not expected by 
the macros.

And also fix other two coding style problems reported by scripts/checkpatch.pl.

Signed-off-by: Rui Teng 
---
 drivers/input/keyboard/twl4030_keypad.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/input/keyboard/twl4030_keypad.c 
b/drivers/input/keyboard/twl4030_keypad.c
index bbcccd6..8d061c0 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -61,9 +61,9 @@ struct twl4030_keypad {
unsigned short  keymap[TWL4030_KEYMAP_SIZE];
u16 kp_state[TWL4030_MAX_ROWS];
boolautorepeat;
-   unsignedn_rows;
-   unsignedn_cols;
-   unsignedirq;
+   unsigned intn_rows;
+   unsigned intn_cols;
+   unsigned intirq;
 
struct device *dbg_dev;
struct input_dev *input;
@@ -110,7 +110,7 @@ struct twl4030_keypad {
 #define KEYP_CTRL_KBD_ON   BIT(6)
 
 /* KEYP_DEB, KEYP_LONG_KEY, KEYP_TIMEOUT_x*/
-#define KEYP_PERIOD_US(t, prescale)((t) / (31 << (prescale + 1)) - 1)
+#define KEYP_PERIOD_US(t, prescale)((t) / (31 << ((prescale) + 1)) - 1)
 
 /* KEYP_LK_PTV_REG Fields */
 #define KEYP_LK_PTV_PTV_SHIFT  5
@@ -263,7 +263,8 @@ static irqreturn_t do_kp_irq(int irq, void *_kp)
ret = twl4030_kpread(kp, , KEYP_ISR1, 1);
 
/* Release all keys if I2C has gone bad or
-* the KEYP has gone to idle state */
+* the KEYP has gone to idle state
+*/
if (ret >= 0 && (reg & KEYP_IMR1_KP))
twl4030_kp_scan(kp, false);
else
-- 
2.5.0