| Message ID | 20211012013735.3523140-2-dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] Input: ep93xx_keypad - annotate suspend/resume as __maybe_unused | expand |
Hi! On Mon, 2021-10-11 at 18:37 -0700, Dmitry Torokhov wrote: > Also drop parenthesis around macros that do not use expressions as they are > not needed. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> > --- > drivers/input/keyboard/ep93xx_keypad.c | 37 +++++++++++++------------- > 1 file changed, 19 insertions(+), 18 deletions(-) > > diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c > index a0c6cdf8e0d3..6be5474ba2f2 100644 > --- a/drivers/input/keyboard/ep93xx_keypad.c > +++ b/drivers/input/keyboard/ep93xx_keypad.c > @@ -17,6 +17,7 @@ > * flag. > */ > > +#include <linux/bits.h> > #include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/interrupt.h> > @@ -35,28 +36,28 @@ > #define KEY_REG 0x08 /* Key Value Capture register */ > > /* Key Scan Initialization Register bit defines */ > -#define KEY_INIT_DBNC_MASK (0x00ff0000) > -#define KEY_INIT_DBNC_SHIFT (16) > -#define KEY_INIT_DIS3KY (1<<15) > -#define KEY_INIT_DIAG (1<<14) > -#define KEY_INIT_BACK (1<<13) > -#define KEY_INIT_T2 (1<<12) > -#define KEY_INIT_PRSCL_MASK (0x000003ff) > -#define KEY_INIT_PRSCL_SHIFT (0) > +#define KEY_INIT_DBNC_MASK GENMASK(23, 16) > +#define KEY_INIT_DBNC_SHIFT 16 > +#define KEY_INIT_DIS3KY BIT(15) > +#define KEY_INIT_DIAG BIT(14) > +#define KEY_INIT_BACK BIT(13) > +#define KEY_INIT_T2 BIT(12) > +#define KEY_INIT_PRSCL_MASK GENMASK(9, 0) > +#define KEY_INIT_PRSCL_SHIFT 0 > > /* Key Scan Diagnostic Register bit defines */ > -#define KEY_DIAG_MASK (0x0000003f) > -#define KEY_DIAG_SHIFT (0) > +#define KEY_DIAG_MASK GENMASK(5, 0) > +#define KEY_DIAG_SHIFT 0 > > /* Key Value Capture Register bit defines */ > -#define KEY_REG_K (1<<15) > -#define KEY_REG_INT (1<<14) > -#define KEY_REG_2KEYS (1<<13) > -#define KEY_REG_1KEY (1<<12) > -#define KEY_REG_KEY2_MASK (0x00000fc0) > -#define KEY_REG_KEY2_SHIFT (6) > -#define KEY_REG_KEY1_MASK (0x0000003f) > -#define KEY_REG_KEY1_SHIFT (0) > +#define KEY_REG_K BIT(15) > +#define KEY_REG_INT BIT(14) > +#define KEY_REG_2KEYS BIT(13) > +#define KEY_REG_1KEY BIT(12) > +#define KEY_REG_KEY2_MASK GENMASK(11, 6) > +#define KEY_REG_KEY2_SHIFT 6 > +#define KEY_REG_KEY1_MASK GENMASK(5, 0) > +#define KEY_REG_KEY1_SHIFT 0 > > #define EP93XX_MATRIX_SIZE (EP93XX_MATRIX_ROWS * EP93XX_MATRIX_COLS) >
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index a0c6cdf8e0d3..6be5474ba2f2 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -17,6 +17,7 @@ * flag. */ +#include <linux/bits.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/interrupt.h> @@ -35,28 +36,28 @@ #define KEY_REG 0x08 /* Key Value Capture register */ /* Key Scan Initialization Register bit defines */ -#define KEY_INIT_DBNC_MASK (0x00ff0000) -#define KEY_INIT_DBNC_SHIFT (16) -#define KEY_INIT_DIS3KY (1<<15) -#define KEY_INIT_DIAG (1<<14) -#define KEY_INIT_BACK (1<<13) -#define KEY_INIT_T2 (1<<12) -#define KEY_INIT_PRSCL_MASK (0x000003ff) -#define KEY_INIT_PRSCL_SHIFT (0) +#define KEY_INIT_DBNC_MASK GENMASK(23, 16) +#define KEY_INIT_DBNC_SHIFT 16 +#define KEY_INIT_DIS3KY BIT(15) +#define KEY_INIT_DIAG BIT(14) +#define KEY_INIT_BACK BIT(13) +#define KEY_INIT_T2 BIT(12) +#define KEY_INIT_PRSCL_MASK GENMASK(9, 0) +#define KEY_INIT_PRSCL_SHIFT 0 /* Key Scan Diagnostic Register bit defines */ -#define KEY_DIAG_MASK (0x0000003f) -#define KEY_DIAG_SHIFT (0) +#define KEY_DIAG_MASK GENMASK(5, 0) +#define KEY_DIAG_SHIFT 0 /* Key Value Capture Register bit defines */ -#define KEY_REG_K (1<<15) -#define KEY_REG_INT (1<<14) -#define KEY_REG_2KEYS (1<<13) -#define KEY_REG_1KEY (1<<12) -#define KEY_REG_KEY2_MASK (0x00000fc0) -#define KEY_REG_KEY2_SHIFT (6) -#define KEY_REG_KEY1_MASK (0x0000003f) -#define KEY_REG_KEY1_SHIFT (0) +#define KEY_REG_K BIT(15) +#define KEY_REG_INT BIT(14) +#define KEY_REG_2KEYS BIT(13) +#define KEY_REG_1KEY BIT(12) +#define KEY_REG_KEY2_MASK GENMASK(11, 6) +#define KEY_REG_KEY2_SHIFT 6 +#define KEY_REG_KEY1_MASK GENMASK(5, 0) +#define KEY_REG_KEY1_SHIFT 0 #define EP93XX_MATRIX_SIZE (EP93XX_MATRIX_ROWS * EP93XX_MATRIX_COLS)
Also drop parenthesis around macros that do not use expressions as they are not needed. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/keyboard/ep93xx_keypad.c | 37 +++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-)