summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2010-12-24 22:13:25 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-28 02:34:22 +0100
commit202b6ca149dc90d3d81772413e1e1c0b65e83012 (patch)
tree7a2e52a5e52a24b08c4a3d10006d2f114a153837 /drivers/input
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/... (diff)
downloadlinux-202b6ca149dc90d3d81772413e1e1c0b65e83012.tar.xz
linux-202b6ca149dc90d3d81772413e1e1c0b65e83012.zip
Input: wacom_w8001 - use __set_bit to set keybits
This makes code safer and easier to read. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wacom_w8001.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index 2a0bec12d12a..49bce13838be 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -374,11 +374,11 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
input_dev->dev.parent = &serio->dev;
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
- input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
- input_dev->keybit[BIT_WORD(BTN_TOOL_PEN)] |= BIT_MASK(BTN_TOOL_PEN);
- input_dev->keybit[BIT_WORD(BTN_TOOL_RUBBER)] |= BIT_MASK(BTN_TOOL_RUBBER);
- input_dev->keybit[BIT_WORD(BTN_STYLUS)] |= BIT_MASK(BTN_STYLUS);
- input_dev->keybit[BIT_WORD(BTN_STYLUS2)] |= BIT_MASK(BTN_STYLUS2);
+ __set_bit(BTN_TOUCH, input_dev->keybit);
+ __set_bit(BTN_TOOL_PEN, input_dev->keybit);
+ __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+ __set_bit(BTN_STYLUS, input_dev->keybit);
+ __set_bit(BTN_STYLUS2, input_dev->keybit);
serio_set_drvdata(serio, w8001);
err = serio_open(serio, drv);