From patchwork Fri Dec 17 17:36:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 416661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBHHa8Kx019577 for ; Fri, 17 Dec 2010 17:36:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754767Ab0LQRgH (ORCPT ); Fri, 17 Dec 2010 12:36:07 -0500 Received: from mail-gx0-f180.google.com ([209.85.161.180]:43646 "EHLO mail-gx0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754753Ab0LQRgF (ORCPT ); Fri, 17 Dec 2010 12:36:05 -0500 Received: by gxk19 with SMTP id 19so520059gxk.11 for ; Fri, 17 Dec 2010 09:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=+iNa7GU/loDwyCQvjSyKdt/Q3c7OYhLbi4yi5iJV2zQ=; b=UueD0MhRPJd5ubOKHyiAbtCQsDTCggY7juc0iM1eWn9pHyH4QsdislQwLogMKha4TU nlh2nFNXi7yDXl+vTn9ct4qP8yec09lEa/lEr6//P2YvYCJtrj+NKsfclxuR/PiIOeHI TgvK/dv50UZdg1oie+wLKJdbVvL4hwVT8GeGU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=B/+mHhzqRCw21VS1p9sepHQpov7JMfbRTefbHkf26fbmjPaiz5LLpaR721bAmtgVoM FNyeu2Q4MsFAegQrFlh1jp25cK8uFyMPQNQsPoiD2SGPIFQ33636YUqgGI7eFhzsAdfg YmpSGgDreqfolF03DYTfIXxrI2h0HsJDfEM60= Received: by 10.150.217.6 with SMTP id p6mr3145923ybg.63.1292607364242; Fri, 17 Dec 2010 09:36:04 -0800 (PST) Received: from localhost.localdomain ([204.119.25.150]) by mx.google.com with ESMTPS id l4sm5660324ybj.9.2010.12.17.09.36.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Dec 2010 09:36:03 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , Ping Cheng Subject: [PATCH 1/3] input - wacom_w8001: use __set_bit to set keybits Date: Fri, 17 Dec 2010 09:36:41 -0800 Message-Id: <1292607401-22603-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.3.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 17 Dec 2010 17:36:26 +0000 (UTC) diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c index 2a0bec1..49bce13 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);