From 593a536fa8bc71725700ba00ffb8eff0132e1f3a Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Mon, 11 Feb 2008 20:21:58 -0500 Subject: psmouse: convert BIT() macro calls to BIT_MASK Signed-off-by: Andres Salomon --- drivers/input/mouse/olpc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers') 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); -- cgit v1.2.3