aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-01-28 19:17:58 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-02-05 02:25:54 -0500
commite47ff893bc674c32ac21094d623533ac6e585ca7 (patch)
tree3737d22ceb78e7d0ead456b26c996d83b694aef5
parent4ec90ac5047e33f5d64e21c31046be2ff8aaaf4b (diff)
Input: sx8654 - convert #defined flags to BIT(x)
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@skidata.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/sx8654.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c
index de83ed1da36e..477533cd40ab 100644
--- a/drivers/input/touchscreen/sx8654.c
+++ b/drivers/input/touchscreen/sx8654.c
@@ -27,6 +27,7 @@
27 * published by the Free Software Foundation. 27 * published by the Free Software Foundation.
28 */ 28 */
29 29
30#include <linux/bitops.h>
30#include <linux/delay.h> 31#include <linux/delay.h>
31#include <linux/gpio/consumer.h> 32#include <linux/gpio/consumer.h>
32#include <linux/i2c.h> 33#include <linux/i2c.h>
@@ -46,7 +47,7 @@
46#define I2C_REG_SOFTRESET 0x3f 47#define I2C_REG_SOFTRESET 0x3f
47 48
48#define I2C_REG_SX8650_STAT 0x05 49#define I2C_REG_SX8650_STAT 0x05
49#define SX8650_STAT_CONVIRQ 0x80 50#define SX8650_STAT_CONVIRQ BIT(7)
50 51
51/* commands */ 52/* commands */
52#define CMD_READ_REGISTER 0x40 53#define CMD_READ_REGISTER 0x40
@@ -56,8 +57,8 @@
56#define SOFTRESET_VALUE 0xde 57#define SOFTRESET_VALUE 0xde
57 58
58/* bits for I2C_REG_IRQSRC */ 59/* bits for I2C_REG_IRQSRC */
59#define IRQ_PENTOUCH_TOUCHCONVDONE 0x08 60#define IRQ_PENTOUCH_TOUCHCONVDONE BIT(3)
60#define IRQ_PENRELEASE 0x04 61#define IRQ_PENRELEASE BIT(2)
61 62
62/* bits for RegTouch1 */ 63/* bits for RegTouch1 */
63#define CONDIRQ 0x20 64#define CONDIRQ 0x20
@@ -65,8 +66,8 @@
65#define FILT_7SA 0x03 66#define FILT_7SA 0x03
66 67
67/* bits for I2C_REG_CHANMASK */ 68/* bits for I2C_REG_CHANMASK */
68#define CONV_X 0x80 69#define CONV_X BIT(7)
69#define CONV_Y 0x40 70#define CONV_Y BIT(6)
70 71
71/* coordinates rate: higher nibble of CTRL0 register */ 72/* coordinates rate: higher nibble of CTRL0 register */
72#define RATE_MANUAL 0x00 73#define RATE_MANUAL 0x00