linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bastian Blank <waldi@debian.org>
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ping Cheng <pingc@wacom.com>
Subject: [PATCH 6/7] Imput: wacom - Remove old feature struct setup
Date: Thu, 7 Jan 2010 19:30:00 +0100	[thread overview]
Message-ID: <20100107183000.GA13008@wavehammer.waldi.eu.org> (raw)
In-Reply-To: <20100107182553.GA11236@wavehammer.waldi.eu.org>

The old feature setup is not longer needed, remove it.

Signed-off-by: Bastian Blank <waldi@debian.org>
---
 drivers/input/tablet/wacom_sys.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

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,
-- 
1.6.5.7


-- 
	"... freedom ... is a worship word..."
	"It is our worship word too."
		-- Cloud William and Kirk, "The Omega Glory", stardate unknown

  parent reply	other threads:[~2010-01-07 18:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-07 18:25 [PATCH 0/7] Input: wacom - Setup features via driver info Bastian Blank
2010-01-07 18:29 ` [PATCH 1/7] Input: wacom - Move device ids to the initialisation Bastian Blank
2010-01-07 18:29 ` [PATCH 2/7] Input: wacom - Get features from driver info Bastian Blank
2010-01-07 19:06   ` Dmitry Torokhov
2010-01-07 19:21     ` Bastian Blank
2010-01-07 19:39       ` Dmitry Torokhov
2010-01-07 18:29 ` [PATCH 3/7] Input: wacom - Set driver info for Wacom Penpartner Bastian Blank
2010-01-07 18:29 ` [PATCH 4/7] Input: wacom - Convert remaining ids, part one Bastian Blank
2010-01-07 18:29 ` [PATCH 5/7] Input: wacom - Convert remaining ids, part two Bastian Blank
2010-01-11 21:22   ` Ping Cheng
2010-01-11 22:24     ` Bastian Blank
2010-02-03  8:47       ` Dmitry Torokhov
     [not found]         ` <bc07448c1002030634m2c8492a4h9dc1c1ad005bc98f@mail.gmail.com>
2010-02-03 17:28           ` Dmitry Torokhov
2010-01-07 18:30 ` Bastian Blank [this message]
2010-01-07 18:30 ` [PATCH 7/7] Input: wacom - Fail on missing features Bastian Blank
2010-01-07 19:08   ` Dmitry Torokhov
2010-01-07 19:21     ` Bastian Blank

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100107183000.GA13008@wavehammer.waldi.eu.org \
    --to=waldi@debian.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pingc@wacom.com \
    --subject='Re: [PATCH 6/7] Imput: wacom - Remove old feature struct setup' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox