diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-11 07:40:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-28 00:01:44 +0100 |
| commit | 582e20a03b9bcbddaeaffb38800323ddcc4a9173 (patch) | |
| tree | 1e40fbce17ea82cca83ae56cb03814e85accfb2a /net/nfc/nci | |
| parent | serial: 68328: Remove bogus ldisc reset (diff) | |
| download | linux-582e20a03b9bcbddaeaffb38800323ddcc4a9173.tar.xz linux-582e20a03b9bcbddaeaffb38800323ddcc4a9173.zip | |
NFC: nci: Remove dead code
The N_NCI ldisc does not define a flush_buffer() ldisc method, so
the check when opening the ldisc is always false.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/uart.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index 21d8875673a4..c468eabd6943 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -171,14 +171,7 @@ static int nci_uart_tty_open(struct tty_struct *tty) tty->disc_data = NULL; tty->receive_room = 65536; - /* Flush any pending characters in the driver and line discipline. */ - - /* FIXME: why is this needed. Note don't use ldisc_ref here as the - * open path is before the ldisc is referencable. - */ - - if (tty->ldisc->ops->flush_buffer) - tty->ldisc->ops->flush_buffer(tty); + /* Flush any pending characters in the driver */ tty_driver_flush_buffer(tty); return 0; |