| From e5d5cfab51ec956d809d5951e2ec3b7d7fe7819c Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Thu, 8 Mar 2012 19:12:10 -0500 |
| Subject: serial: delete useless void casts in 8250.c |
| |
| These might have worked some magic with an ancient gcc back in |
| 1992, but "objdump --disassemble" on gcc 4.6 on x86-64 shows |
| identical output before and after this commit. Send the casts |
| and their hysterical rasins to the bitbucket. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Acked-by: Alan Cox <alan@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 0d263a264c4b8376ccf33248f6fac873310e5e05) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/tty/serial/8250/8250.c | 22 +++++++++++----------- |
| 1 file changed, 11 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c |
| index 06e17d5..5da9f99 100644 |
| --- a/drivers/tty/serial/8250/8250.c |
| +++ b/drivers/tty/serial/8250/8250.c |
| @@ -1218,7 +1218,7 @@ static void autoconfig_irq(struct uart_8250_port *up) |
| ICP = (up->port.iobase & 0xfe0) | 0x1f; |
| save_ICP = inb_p(ICP); |
| outb_p(0x80, ICP); |
| - (void) inb_p(ICP); |
| + inb_p(ICP); |
| } |
| |
| /* forget possible initially masked and pending IRQ */ |
| @@ -1238,10 +1238,10 @@ static void autoconfig_irq(struct uart_8250_port *up) |
| UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2); |
| } |
| serial_out(up, UART_IER, 0x0f); /* enable all intrs */ |
| - (void)serial_in(up, UART_LSR); |
| - (void)serial_in(up, UART_RX); |
| - (void)serial_in(up, UART_IIR); |
| - (void)serial_in(up, UART_MSR); |
| + serial_in(up, UART_LSR); |
| + serial_in(up, UART_RX); |
| + serial_in(up, UART_IIR); |
| + serial_in(up, UART_MSR); |
| serial_out(up, UART_TX, 0xFF); |
| udelay(20); |
| irq = probe_irq_off(irqs); |
| @@ -1971,10 +1971,10 @@ static int serial8250_startup(struct uart_port *port) |
| /* |
| * Clear the interrupt registers. |
| */ |
| - (void) serial_in(up, UART_LSR); |
| - (void) serial_in(up, UART_RX); |
| - (void) serial_in(up, UART_IIR); |
| - (void) serial_in(up, UART_MSR); |
| + serial_in(up, UART_LSR); |
| + serial_in(up, UART_RX); |
| + serial_in(up, UART_IIR); |
| + serial_in(up, UART_MSR); |
| |
| /* |
| * At this point, there's no way the LSR could still be 0xff; |
| @@ -2150,7 +2150,7 @@ dont_test_tx_en: |
| */ |
| icp = (up->port.iobase & 0xfe0) | 0x01f; |
| outb_p(0x80, icp); |
| - (void) inb_p(icp); |
| + inb_p(icp); |
| } |
| |
| return 0; |
| @@ -2196,7 +2196,7 @@ static void serial8250_shutdown(struct uart_port *port) |
| * Read data port to reset things, and then unlink from |
| * the IRQ chain. |
| */ |
| - (void) serial_in(up, UART_RX); |
| + serial_in(up, UART_RX); |
| |
| del_timer_sync(&up->timer); |
| up->timer.function = serial8250_timeout; |
| -- |
| 1.7.10.1.362.g242cab3 |
| |