diff options
author | Alan Cox <alan@redhat.com> | 2008-07-22 06:17:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:03:27 -0400 |
commit | 8ca8b9005a742edf8d82749d4ad4e616405fbdc4 (patch) | |
tree | b05d1794db1c0853af00741b17bc36921e136e52 /drivers/char/mxser.c | |
parent | 30252ec958897d61925a4baf79cd9411a6be0486 (diff) |
mxser: remove dead code
Old style ioctl break code can go
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/mxser.c')
-rw-r--r-- | drivers/char/mxser.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 6307e301bd26..1fb25571bf85 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
@@ -1464,27 +1464,6 @@ static int mxser_get_lsr_info(struct mxser_port *info, | |||
1464 | return put_user(result, value); | 1464 | return put_user(result, value); |
1465 | } | 1465 | } |
1466 | 1466 | ||
1467 | /* | ||
1468 | * This routine sends a break character out the serial port. | ||
1469 | */ | ||
1470 | static void mxser_send_break(struct mxser_port *info, int duration) | ||
1471 | { | ||
1472 | unsigned long flags; | ||
1473 | |||
1474 | if (!info->ioaddr) | ||
1475 | return; | ||
1476 | set_current_state(TASK_INTERRUPTIBLE); | ||
1477 | spin_lock_irqsave(&info->slock, flags); | ||
1478 | outb(inb(info->ioaddr + UART_LCR) | UART_LCR_SBC, | ||
1479 | info->ioaddr + UART_LCR); | ||
1480 | spin_unlock_irqrestore(&info->slock, flags); | ||
1481 | schedule_timeout(duration); | ||
1482 | spin_lock_irqsave(&info->slock, flags); | ||
1483 | outb(inb(info->ioaddr + UART_LCR) & ~UART_LCR_SBC, | ||
1484 | info->ioaddr + UART_LCR); | ||
1485 | spin_unlock_irqrestore(&info->slock, flags); | ||
1486 | } | ||
1487 | |||
1488 | static int mxser_tiocmget(struct tty_struct *tty, struct file *file) | 1467 | static int mxser_tiocmget(struct tty_struct *tty, struct file *file) |
1489 | { | 1468 | { |
1490 | struct mxser_port *info = tty->driver_data; | 1469 | struct mxser_port *info = tty->driver_data; |
@@ -1872,21 +1851,6 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, | |||
1872 | return -EIO; | 1851 | return -EIO; |
1873 | 1852 | ||
1874 | switch (cmd) { | 1853 | switch (cmd) { |
1875 | case TCSBRK: /* SVID version: non-zero arg --> no break */ | ||
1876 | retval = tty_check_change(tty); | ||
1877 | if (retval) | ||
1878 | return retval; | ||
1879 | tty_wait_until_sent(tty, 0); | ||
1880 | if (!arg) | ||
1881 | mxser_send_break(info, HZ / 4); /* 1/4 second */ | ||
1882 | return 0; | ||
1883 | case TCSBRKP: /* support for POSIX tcsendbreak() */ | ||
1884 | retval = tty_check_change(tty); | ||
1885 | if (retval) | ||
1886 | return retval; | ||
1887 | tty_wait_until_sent(tty, 0); | ||
1888 | mxser_send_break(info, arg ? arg * (HZ / 10) : HZ / 4); | ||
1889 | return 0; | ||
1890 | case TIOCGSERIAL: | 1854 | case TIOCGSERIAL: |
1891 | lock_kernel(); | 1855 | lock_kernel(); |
1892 | retval = mxser_get_serial_info(info, argp); | 1856 | retval = mxser_get_serial_info(info, argp); |