HID: remove hid-input-quirks

Remove the file since these is no user now.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 735c371ca02e2a8181f4377eb7b1d8938ced286b..0141ff88008eff6a3c092c2a28cac30da76911bb 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the HID driver
 #
-hid-objs                       := hid-core.o hid-input.o hid-input-quirks.o
+hid-objs                       := hid-core.o hid-input.o
 
 obj-$(CONFIG_HID)              += hid.o
 

diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
deleted file mode 100644 (file)
index 980e745..0000000
--- a/drivers/hid/hid-input-quirks.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  HID-input usage mapping quirks
- *
- *  This is used to handle HID-input mappings for devices violating
- *  HUT 1.12 specification.
- *
- * Copyright (c) 2007-2008 Jiri Kosina
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License
- */
-
-#include <linux/input.h>
-#include <linux/hid.h>
-
-static const struct hid_input_blacklist {
-       __u16 idVendor;
-       __u16 idProduct;
-       int (*quirk)(struct hid_usage *, struct hid_input *, unsigned long **,
-                       int *);
-} hid_input_blacklist[] = {
-       { 0, 0, NULL }
-};
-
-int hidinput_mapping_quirks(struct hid_usage *usage, 
-               struct hid_input *hi, unsigned long **bit, int *max)
-{
-       struct hid_device *device = input_get_drvdata(hi->input);
-       int i = 0;
-       
-       while (hid_input_blacklist[i].quirk) {
-               if (hid_input_blacklist[i].idVendor == device->vendor &&
-                               hid_input_blacklist[i].idProduct == device->product)
-                       return hid_input_blacklist[i].quirk(usage, hi, bit,
-                                       max);
-               i++;
-       }
-       return 0;
-}
-
-int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
-{
-       return 0;
-}
-
-

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 1d2d0827820ce13dcf6ad14f7c0b26a29fdba923..0a68935c20b8c43fb3ae1f652455d2e6a285070e 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -154,7 +154,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 {
        struct input_dev *input = hidinput->input;
        struct hid_device *device = input_get_drvdata(input);
-       int max = 0, code, ret;
+       int max = 0, code;
        unsigned long *bit = NULL;
 
        field->hidinput = hidinput;
@@ -173,11 +173,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                goto ignore;
        }
 
-       /* handle input mappings for quirky devices */
-       ret = hidinput_mapping_quirks(usage, hidinput, &bit, &max);
-       if (ret)
-               goto mapped;
-
        if (device->driver->input_mapping) {
                int ret = device->driver->input_mapping(device, hidinput, field,
                                usage, &bit, &max);
@@ -590,10 +585,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
        if (!usage->type)
                return;
 
-       /* handle input events for quirky devices */
-       if (hidinput_event_quirks(hid, field, usage, value))
-               return;
-
        if (usage->hat_min < usage->hat_max || usage->hat_dir) {
                int hat_dir = usage->hat_dir;
                if (!hat_dir)

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 5b47feecc101b3b89bb604edd9d7294f754a619c..0de5fe8894d9c0139d620fe150cb8e3c91145fbe 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -617,9 +617,6 @@ extern void hidinput_disconnect(struct hid_device *);
 int hid_set_field(struct hid_field *, unsigned, __s32);
 int hid_input_report(struct hid_device *, int type, u8 *, int, int);
 int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
-int hidinput_mapping_quirks(struct hid_usage *, struct hid_input *,
-               unsigned long **, int *);
-int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
 void hid_output_report(struct hid_report *report, __u8 *data);
 struct hid_device *hid_allocate_device(void);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);