The old feature setup is not longer needed, remove it.
Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
