From patchwork Wed Nov 21 18:42:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 1781991 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B9D413FC5A for ; Wed, 21 Nov 2012 18:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755692Ab2KUSmv (ORCPT ); Wed, 21 Nov 2012 13:42:51 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:54786 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755689Ab2KUSmu (ORCPT ); Wed, 21 Nov 2012 13:42:50 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so1834547dak.19 for ; Wed, 21 Nov 2012 10:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=n1RMYbMkP7EJS+2hk/401Sd3EYKQj/Lp/HYzr0R7XiQ=; b=xT235HeXwdNnmeN+5Ru0pnQimgW9Mg9jZItZjdz/yR5XsLOShFil2gLJ3nYS695M11 DL+ZB9rJ7l1jflqtU5x2pfkbGNqjhf35VAtknJgM5Cjvf+Yo2jFr6jfA4oItBDMD9D3N /6cik+Sirytnu+sccbZjjWNN9X1JSt/jsoVjiTaQ54hXGSj9a+G6eh8ewBkDIZ1y2S0a wU5s+cf+/BMIS5lW3jT4yNsxKsoatBNYDiC4cgDPjBQ6tjl3gpQlG7Ezh8brscgKMVkQ H+SgbJVaF+0tpTValBkMgV6omXs4F8oCkYiDHh10WH/ujuiVTD7Sc6Acqz9YESnBqmQM rocA== Received: by 10.68.197.197 with SMTP id iw5mr55078201pbc.22.1353523370156; Wed, 21 Nov 2012 10:42:50 -0800 (PST) Received: from wacom-EP121.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPS id o11sm619065pby.8.2012.11.21.10.42.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 10:42:49 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng Subject: [PATCH 1/2] input : wacom - Simplify type check for newer V5 devices Date: Wed, 21 Nov 2012 10:42:40 -0800 Message-Id: <1353523360-6431-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The updated type enum enables this implementation. Signed-off-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 7554a04..f09f39e 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -467,9 +467,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom) /* general pen packet */ if ((data[1] & 0xb8) == 0xa0) { t = (data[6] << 2) | ((data[7] >> 6) & 3); - if ((features->type >= INTUOS4S && features->type <= INTUOS4L) || - (features->type >= INTUOS5S && features->type <= INTUOS5L) || - (features->type >= WACOM_21UX2 && features->type <= WACOM_24HD)) { + if ((features->type >= INTUOS4S && features->type <= WACOM_24HD)) { t = (t << 1) | (data[1] & 1); } input_report_abs(input, ABS_PRESSURE, t);