4 files changed, 0 insertions, 122 deletions

diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index c236fb3deb59..3cfc076f5f71 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 ZEROPLUS_FF
-        bool "Zeroplus based game controller support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have a Zeroplus based game controller and want to
-          enable force feedback for it.
-
 config USB_HIDDEV
         bool "/dev/hiddev raw HID device support"
         depends on USB_HID
diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index dd3b8634800f..5c460fcdd75c 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_ZEROPLUS_FF),y)
-        usbhid-objs     += hid-zpff.o
-endif
 ifeq ($(CONFIG_HID_FF),y)
         usbhid-objs     += hid-ff.o
 endif
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index ed3a869d54e3..eca01a6fda59 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_ZEROPLUS_FF
-        { 0xc12, 0x0005, hid_zpff_init },
-        { 0xc12, 0x0030, hid_zpff_init },
-#endif
         { 0,     0,      hid_pidff_init}  /* Matches anything */
 };
 
diff --git a/drivers/hid/usbhid/hid-zpff.c b/drivers/hid/usbhid/hid-zpff.c
deleted file mode 100644
index 5a688274f6a3..000000000000
--- a/drivers/hid/usbhid/hid-zpff.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Force feedback support for Zeroplus based devices
- *
- *  Copyright (c) 2005, 2006 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
- */
-
-
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/hid.h>
-#include "usbhid.h"
-
-struct zpff_device {
-        struct hid_report *report;
-};
-
-static int hid_zpff_play(struct input_dev *dev, void *data,
-                         struct ff_effect *effect)
-{
-        struct hid_device *hid = input_get_drvdata(dev);
-        struct zpff_device *zpff = data;
-        int left, right;
-
-        /*
-         * The following is specified the other way around in the Zeroplus
-         * datasheet but the order below is correct for the XFX Executioner;
-         * however it is possible that the XFX Executioner is an exception
-         */
-
-        left = effect->u.rumble.strong_magnitude;
-        right = effect->u.rumble.weak_magnitude;
-        dbg_hid("called with 0x%04x 0x%04x\n", left, right);
-
-        left = left * 0x7f / 0xffff;
-        right = right * 0x7f / 0xffff;
-
-        zpff->report->field[2]->value[0] = left;
-        zpff->report->field[3]->value[0] = right;
-        dbg_hid("running with 0x%02x 0x%02x\n", left, right);
-        usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
-
-        return 0;
-}
-
-int hid_zpff_init(struct hid_device *hid)
-{
-        struct zpff_device *zpff;
-        struct hid_report *report;
-        struct hid_input *hidinput = list_entry(hid->inputs.next,
-                                                struct hid_input, list);
-        struct list_head *report_list =
-                        &hid->report_enum[HID_OUTPUT_REPORT].report_list;
-        struct input_dev *dev = hidinput->input;
-        int error;
-
-        if (list_empty(report_list)) {
-                printk(KERN_ERR "hid-zpff: no output report found\n");
-                return -ENODEV;
-        }
-
-        report = list_entry(report_list->next, struct hid_report, list);
-
-        if (report->maxfield < 4) {
-                printk(KERN_ERR "hid-zpff: not enough fields in report\n");
-                return -ENODEV;
-        }
-
-        zpff = kzalloc(sizeof(struct zpff_device), GFP_KERNEL);
-        if (!zpff)
-                return -ENOMEM;
-
-        set_bit(FF_RUMBLE, dev->ffbit);
-
-        error = input_ff_create_memless(dev, zpff, hid_zpff_play);
-        if (error) {
-                kfree(zpff);
-                return error;
-        }
-
-        zpff->report = report;
-        zpff->report->field[0]->value[0] = 0x00;
-        zpff->report->field[1]->value[0] = 0x02;
-        zpff->report->field[2]->value[0] = 0x00;
-        zpff->report->field[3]->value[0] = 0x00;
-        usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
-
-        printk(KERN_INFO "Force feedback for Zeroplus based devices by "
-               "Anssi Hannula <anssi.hannula@gmail.com>\n");
-
-        return 0;
-}