From patchwork Fri May 17 11:34:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 2582261 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 866C0DF215 for ; Fri, 17 May 2013 11:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752349Ab3EQLe6 (ORCPT ); Fri, 17 May 2013 07:34:58 -0400 Received: from mga11.intel.com ([192.55.52.93]:42441 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750742Ab3EQLe6 (ORCPT ); Fri, 17 May 2013 07:34:58 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 17 May 2013 04:34:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,691,1363158000"; d="scan'208";a="339202054" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.173]) by fmsmga002.fm.intel.com with ESMTP; 17 May 2013 04:34:56 -0700 Received: from andy by smile with local (Exim 4.80) (envelope-from ) id 1UdIvz-0005gK-Fj; Fri, 17 May 2013 14:34:51 +0300 From: Andy Shevchenko To: Jiri Kosina , linux-input@vger.kernel.org, Benjamin Tissoires Cc: Andy Shevchenko Subject: [PATCH v3 2/2] hid: remove duplicate ID for D-WAV eGalax 0x7224 Date: Fri, 17 May 2013 14:34:49 +0300 Message-Id: <1368790489-21792-3-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 1.8.2.rc0.22.gb3600c3 In-Reply-To: <1368790489-21792-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1368790489-21792-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This patch also removes the duplicate entry in the hid-multitouch.c as suggested by Benjamin Tissoires. Signed-off-by: Andy Shevchenko Reviewed-By: Benjamin Tissoires --- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-multitouch.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5b7e148..8add4ae 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -271,7 +271,6 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C 0x720c #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 -#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A 0x722A #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E 0x725e #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262 0x7262 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 590aa37..d99b959 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1131,9 +1131,6 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, - { .driver_data = MT_CLS_EGALAX, - HID_USB_DEVICE(USB_VENDOR_ID_DWAV, - USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) }, { .driver_data = MT_CLS_EGALAX_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },