3 files changed, 0 insertions, 170 deletions

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 21cd2264008..20db36448ab 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -348,13 +348,3 @@ config USB_APPLETOUCH
 
           To compile this driver as a module, choose M here: the
           module will be called appletouch.
-
-config USB_TRANCEVIBRATOR
-        tristate "PlayStation 2 Trance Vibrator driver support"
-        depends on USB
-        help
-          Say Y here if you want to connect a PlayStation 2 Trance Vibrator
-          device to your computer's USB port.
-
-          To compile this driver as a module, choose M here: the
-          module will be called trancevibrator.
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 71437db7e9b..d946d5213b3 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -48,7 +48,6 @@ obj-$(CONFIG_USB_ACECAD)	+= acecad.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
-obj-$(CONFIG_USB_TRANCEVIBRATOR)        += trancevibrator.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/usb/input/trancevibrator.c b/drivers/usb/input/trancevibrator.c
deleted file mode 100644
index 33cd91d11ec..00000000000
--- a/drivers/usb/input/trancevibrator.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * PlayStation 2 Trance Vibrator driver
- *
- * Copyright (C) 2006 Sam Hocevar <sam@zoy.org>
- *
- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* Standard include files */
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-
-/* Version Information */
-#define DRIVER_VERSION "v1.1"
-#define DRIVER_AUTHOR "Sam Hocevar, sam@zoy.org"
-#define DRIVER_DESC "PlayStation 2 Trance Vibrator driver"
-
-#define TRANCEVIBRATOR_VENDOR_ID        0x0b49  /* ASCII Corporation */
-#define TRANCEVIBRATOR_PRODUCT_ID       0x064f  /* Trance Vibrator */
-
-static struct usb_device_id id_table [] = {
-        { USB_DEVICE(TRANCEVIBRATOR_VENDOR_ID, TRANCEVIBRATOR_PRODUCT_ID) },
-        { },
-};
-MODULE_DEVICE_TABLE (usb, id_table);
-
-/* Driver-local specific stuff */
-struct trancevibrator {
-        struct usb_device *udev;
-        unsigned int speed;
-};
-
-static ssize_t show_speed(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-{
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct trancevibrator *tv = usb_get_intfdata(intf);
-
-        return sprintf(buf, "%d\n", tv->speed);
-}
-
-static ssize_t set_speed(struct device *dev, struct device_attribute *attr,
-                         const char *buf, size_t count)
-{
-        struct usb_interface *intf = to_usb_interface(dev);
-        struct trancevibrator *tv = usb_get_intfdata(intf);
-        int temp, retval;
-
-        temp = simple_strtoul(buf, NULL, 10);
-        if (temp > 255)
-                temp = 255;
-        else if (temp < 0)
-                temp = 0;
-        tv->speed = temp;
-
-        dev_dbg(&tv->udev->dev, "speed = %d\n", tv->speed);
-
-        /* Set speed */
-        retval = usb_control_msg(tv->udev, usb_sndctrlpipe(tv->udev, 0),
-                                 0x01, /* vendor request: set speed */
-                                 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                                 tv->speed, /* speed value */
-                                 0, NULL, 0, USB_CTRL_GET_TIMEOUT);
-        if (retval) {
-                dev_dbg(&tv->udev->dev, "retval = %d\n", retval);
-                return retval;
-        }
-        return count;
-}
-
-static DEVICE_ATTR(speed, S_IWUGO | S_IRUGO, show_speed, set_speed);
-
-static int tv_probe(struct usb_interface *interface,
-                    const struct usb_device_id *id)
-{
-        struct usb_device *udev = interface_to_usbdev(interface);
-        struct trancevibrator *dev;
-        int retval;
-
-        dev = kzalloc(sizeof(struct trancevibrator), GFP_KERNEL);
-        if (dev == NULL) {
-                dev_err(&interface->dev, "Out of memory\n");
-                retval = -ENOMEM;
-                goto error;
-        }
-
-        dev->udev = usb_get_dev(udev);
-        usb_set_intfdata(interface, dev);
-        retval = device_create_file(&interface->dev, &dev_attr_speed);
-        if (retval)
-                goto error_create_file;
-
-        return 0;
-
-error_create_file:
-        usb_put_dev(udev);
-        usb_set_intfdata(interface, NULL);
-error:
-        kfree(dev);
-        return retval;
-}
-
-static void tv_disconnect(struct usb_interface *interface)
-{
-        struct trancevibrator *dev;
-
-        dev = usb_get_intfdata (interface);
-        usb_set_intfdata(interface, NULL);
-        device_remove_file(&interface->dev, &dev_attr_speed);
-        usb_put_dev(dev->udev);
-        kfree(dev);
-}
-
-/* USB subsystem object */
-static struct usb_driver tv_driver = {
-        .name =         "trancevibrator",
-        .probe =        tv_probe,
-        .disconnect =   tv_disconnect,
-        .id_table =     id_table,
-};
-
-static int __init tv_init(void)
-{
-        int retval = usb_register(&tv_driver);
-        if (retval) {
-                err("usb_register failed. Error number %d", retval);
-                return retval;
-        }
-
-        info(DRIVER_VERSION ":" DRIVER_DESC);
-        return 0;
-}
-
-static void __exit tv_exit(void)
-{
-        usb_deregister(&tv_driver);
-}
-
-module_init (tv_init);
-module_exit (tv_exit);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");