diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2013-02-06 10:55:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-13 13:17:06 -0500 |
commit | bc80fbe46be7430487a45ad92841932bb2eaa3e6 (patch) | |
tree | 29c769f739f5b1e5eec81885dbb5e9912cf37fd1 | |
parent | 42381572f586d4da57e7d65e0fcb45422be3ba7b (diff) |
tty: Remove ancient hardpps()
hardpps() functionality is provided through the N_PPS line
discipline now. The new function signature was added in commit
025b40ab (2011-01-12). There was no previous macro or
function hardpps(), at least since before the initial commit of
v2.6.12 in 2005. It's unlikely this code has been compiled since.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: George Spelvin <linux@horizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/amiserial.c | 5 | ||||
-rw-r--r-- | drivers/tty/serial/serial_core.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 4c7d70172193..fc700342d43f 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c | |||
@@ -393,11 +393,6 @@ static void check_modem_status(struct serial_state *info) | |||
393 | icount->dsr++; | 393 | icount->dsr++; |
394 | if (dstatus & SER_DCD) { | 394 | if (dstatus & SER_DCD) { |
395 | icount->dcd++; | 395 | icount->dcd++; |
396 | #ifdef CONFIG_HARD_PPS | ||
397 | if ((port->flags & ASYNC_HARDPPS_CD) && | ||
398 | !(status & SER_DCD)) | ||
399 | hardpps(); | ||
400 | #endif | ||
401 | } | 396 | } |
402 | if (dstatus & SER_CTS) | 397 | if (dstatus & SER_CTS) |
403 | icount->cts++; | 398 | icount->cts++; |
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 6ce40c1822fc..a400002dfa84 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
@@ -2734,10 +2734,6 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) | |||
2734 | } | 2734 | } |
2735 | 2735 | ||
2736 | uport->icount.dcd++; | 2736 | uport->icount.dcd++; |
2737 | #ifdef CONFIG_HARD_PPS | ||
2738 | if ((uport->flags & UPF_HARDPPS_CD) && status) | ||
2739 | hardpps(); | ||
2740 | #endif | ||
2741 | 2737 | ||
2742 | if (port->flags & ASYNC_CHECK_CD) { | 2738 | if (port->flags & ASYNC_CHECK_CD) { |
2743 | if (status) | 2739 | if (status) |