From patchwork Thu Jan 7 18:30:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Blank X-Patchwork-Id: 71626 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 o07IhBE5022865 for ; Thu, 7 Jan 2010 18:43:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753447Ab0AGSmL (ORCPT ); Thu, 7 Jan 2010 13:42:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751759Ab0AGSmK (ORCPT ); Thu, 7 Jan 2010 13:42:10 -0500 Received: from wavehammer.waldi.eu.org ([82.139.201.20]:56852 "EHLO wavehammer.waldi.eu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320Ab0AGSkx (ORCPT ); Thu, 7 Jan 2010 13:40:53 -0500 Received: by wavehammer.waldi.eu.org (Postfix, from userid 1000) id 6DC2D541C5; Thu, 7 Jan 2010 19:30:00 +0100 (CET) Date: Thu, 7 Jan 2010 19:30:00 +0100 From: Bastian Blank To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Ping Cheng Subject: [PATCH 6/7] Imput: wacom - Remove old feature struct setup Message-ID: <20100107183000.GA13008@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 3a7e8db..41a631b 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -524,8 +524,6 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf, return error; } -static struct wacom_features *get_wacom_feature(const struct usb_device_id *id); - static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) { struct usb_device *dev = interface_to_usbdev(intf); @@ -557,8 +555,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i usb_make_path(dev, wacom->phys, sizeof(wacom->phys)); strlcat(wacom->phys, "/input0", sizeof(wacom->phys)); - if (!features) - features = get_wacom_feature(id); wacom_wac->features = features; BUG_ON(features->pktlen > WACOM_PKGLEN_MAX); @@ -665,8 +661,6 @@ static int wacom_reset_resume(struct usb_interface *intf) return wacom_resume(intf); } -static struct wacom_features wacom_features[] = {}; - static struct wacom_features wacom_features_0x00 = { "Wacom Penpartner", WACOM_PKGLEN_PENPRTN, 5040, 3780, 255, 0, PENPARTNER }; static struct wacom_features wacom_features_0x10 = @@ -865,14 +859,6 @@ static struct usb_device_id wacom_ids[] = { { } }; -static struct wacom_features * get_wacom_feature(const struct usb_device_id *id) -{ - int index = id - wacom_ids; - struct wacom_features *wf = &wacom_features[index]; - - return wf; -} - static struct usb_driver wacom_driver = { .name = "wacom", .id_table = wacom_ids,