HID: move pantherlord FF processing

Move the force feedback processing into a separate module.

[jkosina@suse.cz: fix Kconfig texts a little bit]

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

5 files changed, 0 insertions, 155 deletions

diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 0e7e2e6d975e..02c8228ed7ee 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -44,14 +44,6 @@ config HID_PID
           feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such
           devices.
 
-config PANTHERLORD_FF
-        bool "PantherLord/GreenAsia based device support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have a PantherLord/GreenAsia based game controller
-          or adapter and want to enable force feedback support for it.
-
 config THRUSTMASTER_FF
         bool "ThrustMaster devices support"
         depends on HID_FF
diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index 224c62dc6a32..0ee4803375b2 100644
--- a/drivers/hid/usbhid/Makefile
+++ b/drivers/hid/usbhid/Makefile
@@ -13,9 +13,6 @@ endif
 ifeq ($(CONFIG_HID_PID),y)
         usbhid-objs     += hid-pidff.o
 endif
-ifeq ($(CONFIG_PANTHERLORD_FF),y)
-        usbhid-objs     += hid-plff.o
-endif
 ifeq ($(CONFIG_THRUSTMASTER_FF),y)
         usbhid-objs     += hid-tmff.o
 endif
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index 8891f60d3beb..a868eef06189 100644
--- a/drivers/hid/usbhid/hid-ff.c
+++ b/drivers/hid/usbhid/hid-ff.c
@@ -50,10 +50,6 @@ struct hid_ff_initializer {
  * be a PID device
  */
 static struct hid_ff_initializer inits[] = {
-#ifdef CONFIG_PANTHERLORD_FF
-        { 0x810, 0x0001, hid_plff_init }, /* "Twin USB Joystick" */
-        { 0xe8f, 0x0003, hid_plff_init }, /* "GreenAsia Inc.    USB Joystick     " */
-#endif
 #ifdef CONFIG_THRUSTMASTER_FF
         { 0x44f, 0xb300, hid_tmff_init },
         { 0x44f, 0xb304, hid_tmff_init },
diff --git a/drivers/hid/usbhid/hid-plff.c b/drivers/hid/usbhid/hid-plff.c
deleted file mode 100644
index 9eb83cf9d22b..000000000000
--- a/drivers/hid/usbhid/hid-plff.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  Force feedback support for PantherLord/GreenAsia based devices
- *
- *  The devices are distributed under various names and the same USB device ID
- *  can be used in both adapters and actual game controllers.
- *
- *  0810:0001 "Twin USB Joystick"
- *   - tested with PantherLord USB/PS2 2in1 Adapter
- *   - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)
- *
- *  0e8f:0003 "GreenAsia Inc.    USB Joystick     "
- *   - tested with Köng Gaming gamepad
- *
- *  Copyright (c) 2007 Anssi Hannula <anssi.hannula@gmail.com>
- */
-
-/*
- * 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, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-/* #define DEBUG */
-
-#define debug(format, arg...) pr_debug("hid-plff: " format "\n" , ## arg)
-
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/hid.h>
-#include "usbhid.h"
-
-struct plff_device {
-        struct hid_report *report;
-};
-
-static int hid_plff_play(struct input_dev *dev, void *data,
-                         struct ff_effect *effect)
-{
-        struct hid_device *hid = input_get_drvdata(dev);
-        struct plff_device *plff = data;
-        int left, right;
-
-        left = effect->u.rumble.strong_magnitude;
-        right = effect->u.rumble.weak_magnitude;
-        debug("called with 0x%04x 0x%04x", left, right);
-
-        left = left * 0x7f / 0xffff;
-        right = right * 0x7f / 0xffff;
-
-        plff->report->field[0]->value[2] = left;
-        plff->report->field[0]->value[3] = right;
-        debug("running with 0x%02x 0x%02x", left, right);
-        usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
-
-        return 0;
-}
-
-int hid_plff_init(struct hid_device *hid)
-{
-        struct plff_device *plff;
-        struct hid_report *report;
-        struct hid_input *hidinput;
-        struct list_head *report_list =
-                        &hid->report_enum[HID_OUTPUT_REPORT].report_list;
-        struct list_head *report_ptr = report_list;
-        struct input_dev *dev;
-        int error;
-
-        /* The device contains one output report per physical device, all
-           containing 1 field, which contains 4 ff00.0002 usages and 4 16bit
-           absolute values.
-
-           The input reports also contain a field which contains
-           8 ff00.0001 usages and 8 boolean values. Their meaning is
-           currently unknown. */
-
-        if (list_empty(report_list)) {
-                printk(KERN_ERR "hid-plff: no output reports found\n");
-                return -ENODEV;
-        }
-
-        list_for_each_entry(hidinput, &hid->inputs, list) {
-
-                report_ptr = report_ptr->next;
-
-                if (report_ptr == report_list) {
-                        printk(KERN_ERR "hid-plff: required output report is missing\n");
-                        return -ENODEV;
-                }
-
-                report = list_entry(report_ptr, struct hid_report, list);
-                if (report->maxfield < 1) {
-                        printk(KERN_ERR "hid-plff: no fields in the report\n");
-                        return -ENODEV;
-                }
-
-                if (report->field[0]->report_count < 4) {
-                        printk(KERN_ERR "hid-plff: not enough values in the field\n");
-                        return -ENODEV;
-                }
-
-                plff = kzalloc(sizeof(struct plff_device), GFP_KERNEL);
-                if (!plff)
-                        return -ENOMEM;
-
-                dev = hidinput->input;
-
-                set_bit(FF_RUMBLE, dev->ffbit);
-
-                error = input_ff_create_memless(dev, plff, hid_plff_play);
-                if (error) {
-                        kfree(plff);
-                        return error;
-                }
-
-                plff->report = report;
-                plff->report->field[0]->value[0] = 0x00;
-                plff->report->field[0]->value[1] = 0x00;
-                plff->report->field[0]->value[2] = 0x00;
-                plff->report->field[0]->value[3] = 0x00;
-                usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
-        }
-
-        printk(KERN_INFO "hid-plff: Force feedback for PantherLord/GreenAsia "
-               "devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
-
-        return 0;
-}
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index d40f00904c5e..47ebe045f9b5 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -32,7 +32,6 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
-        { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },