From patchwork Tue Nov 18 21:28:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 5333361 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CE0E59F1E1 for ; Tue, 18 Nov 2014 21:28:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D439C201CD for ; Tue, 18 Nov 2014 21:28:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6AB620125 for ; Tue, 18 Nov 2014 21:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932413AbaKRV2r (ORCPT ); Tue, 18 Nov 2014 16:28:47 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:63853 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932079AbaKRV2p (ORCPT ); Tue, 18 Nov 2014 16:28:45 -0500 Received: by mail-pd0-f179.google.com with SMTP id g10so23988644pdj.24 for ; Tue, 18 Nov 2014 13:28:45 -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; bh=4RRMu1nsTYLZY83CnJPALbz69MiKogdpywwzy6fQ9pM=; b=sVYIdhIB14+OLKkC3hMQy9BfZy2nepeL8D51MHy8GehiWtOx9lNMSKrYB9S2FgCqbZ 6sBWIHJlzyD31pZmpvPrOareT8RHyY2i7Bdzw8raQ6Bnio5upu+uTHyWLgzX7td0y5h5 IaNn6UEE20cwnmw1cf/qWcGvYVAXBseW63ir3wqSbQ4zx81hs8hC0we1nU5I0kWhBclU yfaw0kFqf1ELzrTleRDn/CzyGx6jW/n9YPlfK4XDmerX9bjGn9eGLUGcNdxQVK9eFjLG LlPZioB4H1giPWTQFJ08BdCuax2kX7U9ZG4fUSylyB/83NE3mNawZJvHvYEVZ0KRF9nb xZ3w== X-Received: by 10.70.130.47 with SMTP id ob15mr40369078pdb.112.1416346125120; Tue, 18 Nov 2014 13:28:45 -0800 (PST) Received: from wacom-XPS-8500.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPSA id lb9sm21105370pbc.22.2014.11.18.13.28.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Nov 2014 13:28:44 -0800 (PST) From: Ping Cheng X-Google-Original-From: Ping Cheng To: jkosina@suse.cz Cc: linux-input@vger.kernel.org, benjamin.tissoires@gmail.com, Ping Cheng Subject: [PATCH 2/3] HID: wacom - Cleanup input_capabilities for Graphire 4 and Bamboo Fun Date: Tue, 18 Nov 2014 13:28:37 -0800 Message-Id: <1416346117-11307-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Graphire 4 only has two tablet buttons; Bamboo Fun touch ring is only for PAD. Signed-off-by: Ping Cheng Reviewed-by: Benjamin Tissoires --- drivers/hid/wacom_wac.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 372d890..792569c 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -2047,9 +2047,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, switch (features->type) { case WACOM_MO: - input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0); - /* fall through */ - case WACOM_G4: /* fall through */ @@ -2303,9 +2300,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, case WACOM_G4: __set_bit(BTN_BACK, input_dev->keybit); - __set_bit(BTN_LEFT, input_dev->keybit); __set_bit(BTN_FORWARD, input_dev->keybit); - __set_bit(BTN_RIGHT, input_dev->keybit); input_set_capability(input_dev, EV_REL, REL_WHEEL); break;