diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-11 01:40:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-27 18:01:44 -0500 |
commit | 582e20a03b9bcbddaeaffb38800323ddcc4a9173 (patch) | |
tree | 1e40fbce17ea82cca83ae56cb03814e85accfb2a | |
parent | 46b94e779e8a53b83e8d84e5aeb443d8b8bd45ea (diff) |
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>
-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) | |||
171 | tty->disc_data = NULL; | 171 | tty->disc_data = NULL; |
172 | tty->receive_room = 65536; | 172 | tty->receive_room = 65536; |
173 | 173 | ||
174 | /* Flush any pending characters in the driver and line discipline. */ | 174 | /* Flush any pending characters in the driver */ |
175 | |||
176 | /* FIXME: why is this needed. Note don't use ldisc_ref here as the | ||
177 | * open path is before the ldisc is referencable. | ||
178 | */ | ||
179 | |||
180 | if (tty->ldisc->ops->flush_buffer) | ||
181 | tty->ldisc->ops->flush_buffer(tty); | ||
182 | tty_driver_flush_buffer(tty); | 175 | tty_driver_flush_buffer(tty); |
183 | 176 | ||
184 | return 0; | 177 | return 0; |