USB: oti6858: Remove broken ioctl code in -mm tree and also the broken fixes

This stuff is simply not needed.

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 833ada47fc5429938af9045baa7e9fb68dda4b1a..64f3f66a7a353b8962ad9dffb4f3a7b752f7b6c1 100644 (file)
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -817,21 +817,6 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
                                __FUNCTION__, port->number, cmd, arg);
 
        switch (cmd) {
-               case TCGETS:
-                       if (kernel_termios_to_user_termios((struct ktermios __user *)arg,
-                                                          port->tty->termios))
-                               return -EFAULT;
-                       return 0;
-
-               case TCSETS:
-               case TCSETSW:   /* FIXME: this is not the same! */
-               case TCSETSF:   /* FIXME: this is not the same! */
-                       if (user_termios_to_kernel_termios(port->tty->termios,
-                                               (struct ktermios __user *)arg))
-                               return -EFAULT;
-                       oti6858_set_termios(port, NULL);
-                       return 0;
-
                case TCFLSH:
                        /* FIXME */
                        return 0;