From patchwork Thu Jan 7 18:29:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Blank X-Patchwork-Id: 71627 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o07IhBE6022865 for ; Thu, 7 Jan 2010 18:43:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753467Ab0AGSmh (ORCPT ); Thu, 7 Jan 2010 13:42:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752023Ab0AGSkw (ORCPT ); Thu, 7 Jan 2010 13:40:52 -0500 Received: from wavehammer.waldi.eu.org ([82.139.201.20]:56846 "EHLO wavehammer.waldi.eu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719Ab0AGSkv (ORCPT ); Thu, 7 Jan 2010 13:40:51 -0500 Received: by wavehammer.waldi.eu.org (Postfix, from userid 1000) id 1646F541C2; Thu, 7 Jan 2010 19:29:42 +0100 (CET) Date: Thu, 7 Jan 2010 19:29:42 +0100 From: Bastian Blank To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng Subject: [PATCH 3/7] Input: wacom - Set driver info for Wacom Penpartner Message-ID: <20100107182941.GA12938@wavehammer.waldi.eu.org> Mail-Followup-To: Bastian Blank , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng References: <20100107182553.GA11236@wavehammer.waldi.eu.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100107182553.GA11236@wavehammer.waldi.eu.org> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index b0f3fc3..aa02fb1 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -665,8 +665,11 @@ static int wacom_reset_resume(struct usb_interface *intf) return wacom_resume(intf); } +static struct wacom_features wacom_features_0x00 = + { "Wacom Penpartner", WACOM_PKGLEN_PENPRTN, 5040, 3780, 255, 0, PENPARTNER }; + static struct wacom_features wacom_features[] = { - { "Wacom Penpartner", WACOM_PKGLEN_PENPRTN, 5040, 3780, 255, 0, PENPARTNER }, + { }, { "Wacom Graphire", WACOM_PKGLEN_GRAPHIRE, 10206, 7422, 511, 63, GRAPHIRE }, { "Wacom Graphire2 4x5", WACOM_PKGLEN_GRAPHIRE, 10206, 7422, 511, 63, GRAPHIRE }, { "Wacom Graphire2 5x7", WACOM_PKGLEN_GRAPHIRE, 13918, 10206, 511, 63, GRAPHIRE }, @@ -732,8 +735,12 @@ static struct wacom_features wacom_features[] = { { } }; +#define USB_DEVICE_WACOM(prod) \ + USB_DEVICE(USB_VENDOR_ID_WACOM,prod), \ + .driver_info = (uintptr_t)&wacom_features_##prod + static struct usb_device_id wacom_ids[] = { - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x00) }, + { USB_DEVICE_WACOM(0x00) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x10) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) }, { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },