diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2010-01-19 06:13:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:43:16 -0500 |
commit | b2ced4f69ea87399a37b4485280c52034a0161a8 (patch) | |
tree | 0eae60c4c2bbc705b26c3fc02a90288392a7ea80 /drivers/serial | |
parent | ca1cce49c2778439d00bbf516f70386f3d3b71e5 (diff) |
serial: bfin_5xx: remove useless gpio handling with hard flow control
For UARTs that have dedicated hardware flow control support, there will be
no gpios to request/free as they are part of the normal peripheral pins.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/bfin_5xx.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index 50abb7e557f4..15843cceb9fc 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
@@ -746,15 +746,6 @@ static int bfin_serial_startup(struct uart_port *port) | |||
746 | Status interrupt.\n"); | 746 | Status interrupt.\n"); |
747 | } | 747 | } |
748 | 748 | ||
749 | if (uart->cts_pin >= 0) { | ||
750 | gpio_request(uart->cts_pin, DRIVER_NAME); | ||
751 | gpio_direction_output(uart->cts_pin, 1); | ||
752 | } | ||
753 | if (uart->rts_pin >= 0) { | ||
754 | gpio_request(uart->rts_pin, DRIVER_NAME); | ||
755 | gpio_direction_output(uart->rts_pin, 0); | ||
756 | } | ||
757 | |||
758 | /* CTS RTS PINs are negative assertive. */ | 749 | /* CTS RTS PINs are negative assertive. */ |
759 | UART_PUT_MCR(uart, ACTS); | 750 | UART_PUT_MCR(uart, ACTS); |
760 | UART_SET_IER(uart, EDSSI); | 751 | UART_SET_IER(uart, EDSSI); |
@@ -801,10 +792,6 @@ static void bfin_serial_shutdown(struct uart_port *port) | |||
801 | gpio_free(uart->rts_pin); | 792 | gpio_free(uart->rts_pin); |
802 | #endif | 793 | #endif |
803 | #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS | 794 | #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS |
804 | if (uart->cts_pin >= 0) | ||
805 | gpio_free(uart->cts_pin); | ||
806 | if (uart->rts_pin >= 0) | ||
807 | gpio_free(uart->rts_pin); | ||
808 | if (UART_GET_IER(uart) && EDSSI) | 795 | if (UART_GET_IER(uart) && EDSSI) |
809 | free_irq(uart->status_irq, uart); | 796 | free_irq(uart->status_irq, uart); |
810 | #endif | 797 | #endif |
@@ -1409,8 +1396,7 @@ static int bfin_serial_remove(struct platform_device *dev) | |||
1409 | continue; | 1396 | continue; |
1410 | uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port); | 1397 | uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port); |
1411 | bfin_serial_ports[i].port.dev = NULL; | 1398 | bfin_serial_ports[i].port.dev = NULL; |
1412 | #if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \ | 1399 | #if defined(CONFIG_SERIAL_BFIN_CTSRTS) |
1413 | defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS) | ||
1414 | gpio_free(bfin_serial_ports[i].cts_pin); | 1400 | gpio_free(bfin_serial_ports[i].cts_pin); |
1415 | gpio_free(bfin_serial_ports[i].rts_pin); | 1401 | gpio_free(bfin_serial_ports[i].rts_pin); |
1416 | #endif | 1402 | #endif |