diff options
author | Jon Hunter <jonathanh@nvidia.com> | 2015-10-09 09:50:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 00:07:57 -0400 |
commit | 2230a9475f7f00173382806f1e4b9ea53d83a469 (patch) | |
tree | 04b666ec4042e5d42393f5d54ac88ba94bebfa74 | |
parent | 2a24bb28a315ea2579fbf13a99a69a10cf4c085e (diff) |
serial: tegra: Remove unnecessary return statements
Some functions in the serial-tegra driver have unnecessary return
statements at the end of a void function and so remove them.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/serial-tegra.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c index 38b49f447bd7..42583484d4b2 100644 --- a/drivers/tty/serial/serial-tegra.c +++ b/drivers/tty/serial/serial-tegra.c | |||
@@ -186,7 +186,6 @@ static void set_rts(struct tegra_uart_port *tup, bool active) | |||
186 | tegra_uart_write(tup, mcr, UART_MCR); | 186 | tegra_uart_write(tup, mcr, UART_MCR); |
187 | tup->mcr_shadow = mcr; | 187 | tup->mcr_shadow = mcr; |
188 | } | 188 | } |
189 | return; | ||
190 | } | 189 | } |
191 | 190 | ||
192 | static void set_dtr(struct tegra_uart_port *tup, bool active) | 191 | static void set_dtr(struct tegra_uart_port *tup, bool active) |
@@ -202,7 +201,6 @@ static void set_dtr(struct tegra_uart_port *tup, bool active) | |||
202 | tegra_uart_write(tup, mcr, UART_MCR); | 201 | tegra_uart_write(tup, mcr, UART_MCR); |
203 | tup->mcr_shadow = mcr; | 202 | tup->mcr_shadow = mcr; |
204 | } | 203 | } |
205 | return; | ||
206 | } | 204 | } |
207 | 205 | ||
208 | static void tegra_uart_set_mctrl(struct uart_port *u, unsigned int mctrl) | 206 | static void tegra_uart_set_mctrl(struct uart_port *u, unsigned int mctrl) |
@@ -217,7 +215,6 @@ static void tegra_uart_set_mctrl(struct uart_port *u, unsigned int mctrl) | |||
217 | 215 | ||
218 | dtr_enable = !!(mctrl & TIOCM_DTR); | 216 | dtr_enable = !!(mctrl & TIOCM_DTR); |
219 | set_dtr(tup, dtr_enable); | 217 | set_dtr(tup, dtr_enable); |
220 | return; | ||
221 | } | 218 | } |
222 | 219 | ||
223 | static void tegra_uart_break_ctl(struct uart_port *u, int break_ctl) | 220 | static void tegra_uart_break_ctl(struct uart_port *u, int break_ctl) |
@@ -511,7 +508,6 @@ static void tegra_uart_stop_tx(struct uart_port *u) | |||
511 | async_tx_ack(tup->tx_dma_desc); | 508 | async_tx_ack(tup->tx_dma_desc); |
512 | xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1); | 509 | xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1); |
513 | tup->tx_in_progress = 0; | 510 | tup->tx_in_progress = 0; |
514 | return; | ||
515 | } | 511 | } |
516 | 512 | ||
517 | static void tegra_uart_handle_tx_pio(struct tegra_uart_port *tup) | 513 | static void tegra_uart_handle_tx_pio(struct tegra_uart_port *tup) |
@@ -523,7 +519,6 @@ static void tegra_uart_handle_tx_pio(struct tegra_uart_port *tup) | |||
523 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 519 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
524 | uart_write_wakeup(&tup->uport); | 520 | uart_write_wakeup(&tup->uport); |
525 | tegra_uart_start_next_tx(tup); | 521 | tegra_uart_start_next_tx(tup); |
526 | return; | ||
527 | } | 522 | } |
528 | 523 | ||
529 | static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup, | 524 | static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup, |
@@ -545,8 +540,6 @@ static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup, | |||
545 | if (!uart_handle_sysrq_char(&tup->uport, ch) && tty) | 540 | if (!uart_handle_sysrq_char(&tup->uport, ch) && tty) |
546 | tty_insert_flip_char(tty, ch, flag); | 541 | tty_insert_flip_char(tty, ch, flag); |
547 | } while (1); | 542 | } while (1); |
548 | |||
549 | return; | ||
550 | } | 543 | } |
551 | 544 | ||
552 | static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, | 545 | static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, |
@@ -691,7 +684,6 @@ static void tegra_uart_handle_modem_signal_change(struct uart_port *u) | |||
691 | /* Will start/stop_tx accordingly */ | 684 | /* Will start/stop_tx accordingly */ |
692 | if (msr & UART_MSR_DCTS) | 685 | if (msr & UART_MSR_DCTS) |
693 | uart_handle_cts_change(&tup->uport, msr & UART_MSR_CTS); | 686 | uart_handle_cts_change(&tup->uport, msr & UART_MSR_CTS); |
694 | return; | ||
695 | } | 687 | } |
696 | 688 | ||
697 | static irqreturn_t tegra_uart_isr(int irq, void *data) | 689 | static irqreturn_t tegra_uart_isr(int irq, void *data) |
@@ -799,7 +791,6 @@ static void tegra_uart_stop_rx(struct uart_port *u) | |||
799 | tty_flip_buffer_push(port); | 791 | tty_flip_buffer_push(port); |
800 | tty_kref_put(tty); | 792 | tty_kref_put(tty); |
801 | } | 793 | } |
802 | return; | ||
803 | } | 794 | } |
804 | 795 | ||
805 | static void tegra_uart_hw_deinit(struct tegra_uart_port *tup) | 796 | static void tegra_uart_hw_deinit(struct tegra_uart_port *tup) |
@@ -1077,7 +1068,6 @@ static void tegra_uart_flush_buffer(struct uart_port *u) | |||
1077 | tup->tx_bytes = 0; | 1068 | tup->tx_bytes = 0; |
1078 | if (tup->tx_dma_chan) | 1069 | if (tup->tx_dma_chan) |
1079 | dmaengine_terminate_all(tup->tx_dma_chan); | 1070 | dmaengine_terminate_all(tup->tx_dma_chan); |
1080 | return; | ||
1081 | } | 1071 | } |
1082 | 1072 | ||
1083 | static void tegra_uart_shutdown(struct uart_port *u) | 1073 | static void tegra_uart_shutdown(struct uart_port *u) |
@@ -1217,7 +1207,6 @@ static void tegra_uart_set_termios(struct uart_port *u, | |||
1217 | tegra_uart_read(tup, UART_IER); | 1207 | tegra_uart_read(tup, UART_IER); |
1218 | 1208 | ||
1219 | spin_unlock_irqrestore(&u->lock, flags); | 1209 | spin_unlock_irqrestore(&u->lock, flags); |
1220 | return; | ||
1221 | } | 1210 | } |
1222 | 1211 | ||
1223 | static const char *tegra_uart_type(struct uart_port *u) | 1212 | static const char *tegra_uart_type(struct uart_port *u) |