]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: dgrp: remove TIOCGSOFTCAR and TIOCSSOFTCAR handling
authorBill Pemberton <wfp5p@virginia.edu>
Wed, 14 Nov 2012 14:13:54 +0000 (09:13 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Nov 2012 00:27:36 +0000 (16:27 -0800)
The TIOCGSOFTCAR and TIOCSSOFTCAR ioctls are handled by the tty layer
so the dgrp driver shouldn't try to deal with them itself.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgrp/dgrp_tty.c

index e125b03598d73e5b40815cad70887793162802c5..efa62ced7c8a9b4f8a60a91ed61b49d7fe263884 100644 (file)
@@ -2615,21 +2615,6 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                 */
                return 0;
 
-       case TIOCGSOFTCAR:
-               rc = access_ok(VERIFY_WRITE, (void __user *) arg,
-                              sizeof(long));
-               if (rc == 0)
-                       return -EFAULT;
-               put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
-               return 0;
-
-       case TIOCSSOFTCAR:
-               get_user(arg, (unsigned long __user *) arg);
-               tty->termios.c_cflag =
-                       ((tty->termios.c_cflag & ~CLOCAL) |
-                        (arg ? CLOCAL : 0));
-               return 0;
-
        case TIOCMGET:
                rc = access_ok(VERIFY_WRITE, (void __user *) arg,
                                 sizeof(unsigned int));