diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-02-11 20:21:58 -0500 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-02-11 20:21:58 -0500 |
| commit | 593a536fa8bc71725700ba00ffb8eff0132e1f3a (patch) | |
| tree | 640fb7df27ef16eaea7b72222b45247d3443ad6a /drivers/input | |
| parent | 24750f15119e914b057f5320839fda60c81ca8f3 (diff) | |
| download | lwn-593a536fa8bc71725700ba00ffb8eff0132e1f3a.tar.gz lwn-593a536fa8bc71725700ba00ffb8eff0132e1f3a.zip | |
psmouse: convert BIT() macro calls to BIT_MASK
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/olpc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c index 318656800f12..0a2a5b128e59 100644 --- a/drivers/input/mouse/olpc.c +++ b/drivers/input/mouse/olpc.c @@ -746,10 +746,11 @@ int olpc_init(struct psmouse *psmouse) goto init_fail; } - /* Unset things that psmouse-base sets that we don't have */ - pt->evbit[0] &= ~BIT(EV_REL); - pt->keybit[LONG(BTN_MOUSE)] &= ~BIT(BTN_MIDDLE); - pt->relbit[0] &= ~(BIT(REL_X) | BIT(REL_Y)); + /* Unset all the things that psmouse-base sets */ + pt->evbit[0] &= ~(BIT_MASK(EV_KEY) | BIT_MASK(EV_REL)); + pt->keybit[BIT_WORD(BTN_MOUSE)] &= ~(BIT_MASK(BTN_LEFT) | + BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT)); + pt->relbit[0] &= ~(BIT_MASK(REL_X) | BIT_MASK(REL_Y)); /* Set all the things we *do* have */ set_bit(EV_KEY, pt->evbit); |