Re: [RESEND PATCH v2 8/8] Input: sx8654 - convert #defined flags to BIT(x)

From: Dmitry Torokhov
Date: Mon Jan 28 2019 - 19:25:24 EST


On Tue, Dec 18, 2018 at 09:40:02AM +0100, Richard Leitner wrote:
> Some of the #defined register values are one-bit flags. Convert them to
> use the BIT(x) macro instead of 1 byte hexadecimal values. This improves
> readability and clarifies the intent.
>
> Signed-off-by: Richard Leitner <richard.leitner@xxxxxxxxxxx>

Applied, thank you.

> ---
> drivers/input/touchscreen/sx8654.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c
> index b7b263ed52af..3746ea855f94 100644
> --- a/drivers/input/touchscreen/sx8654.c
> +++ b/drivers/input/touchscreen/sx8654.c
> @@ -36,6 +36,7 @@
> #include <linux/gpio/consumer.h>
> #include <linux/delay.h>
> #include <linux/input/touchscreen.h>
> +#include <linux/bitops.h>
>
> /* register addresses */
> #define I2C_REG_TOUCH0 0x00
> @@ -46,7 +47,7 @@
> #define I2C_REG_SOFTRESET 0x3f
>
> #define I2C_REG_SX8650_STAT 0x05
> -#define SX8650_STAT_CONVIRQ 0x80
> +#define SX8650_STAT_CONVIRQ BIT(7)
>
> /* commands */
> #define CMD_READ_REGISTER 0x40
> @@ -56,8 +57,8 @@
> #define SOFTRESET_VALUE 0xde
>
> /* bits for I2C_REG_IRQSRC */
> -#define IRQ_PENTOUCH_TOUCHCONVDONE 0x08
> -#define IRQ_PENRELEASE 0x04
> +#define IRQ_PENTOUCH_TOUCHCONVDONE BIT(7)
> +#define IRQ_PENRELEASE BIT(6)
>
> /* bits for RegTouch1 */
> #define CONDIRQ 0x20
> @@ -65,8 +66,8 @@
> #define FILT_7SA 0x03
>
> /* bits for I2C_REG_CHANMASK */
> -#define CONV_X 0x80
> -#define CONV_Y 0x40
> +#define CONV_X BIT(7)
> +#define CONV_Y BIT(6)
>
> /* coordinates rate: higher nibble of CTRL0 register */
> #define RATE_MANUAL 0x00
> --
> 2.11.0
>

--
Dmitry