]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
serial: bfin_5xx: remove useless gpio handling with hard flow control
authorSonic Zhang <sonic.zhang@analog.com>
Tue, 19 Jan 2010 11:13:10 +0000 (06:13 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 2 Mar 2010 22:43:16 +0000 (14:43 -0800)
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>
drivers/serial/bfin_5xx.c

index 50abb7e557f4dd23e1eb081508b7fef984ca3f60..15843cceb9fc4ec40a3e276ee3efe82808d2dacd 100644 (file)
@@ -746,15 +746,6 @@ static int bfin_serial_startup(struct uart_port *port)
                        Status interrupt.\n");
        }
 
-       if (uart->cts_pin >= 0) {
-               gpio_request(uart->cts_pin, DRIVER_NAME);
-               gpio_direction_output(uart->cts_pin, 1);
-       }
-       if (uart->rts_pin >= 0) {
-               gpio_request(uart->rts_pin, DRIVER_NAME);
-               gpio_direction_output(uart->rts_pin, 0);
-       }
-
        /* CTS RTS PINs are negative assertive. */
        UART_PUT_MCR(uart, ACTS);
        UART_SET_IER(uart, EDSSI);
@@ -801,10 +792,6 @@ static void bfin_serial_shutdown(struct uart_port *port)
                gpio_free(uart->rts_pin);
 #endif
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-       if (uart->cts_pin >= 0)
-               gpio_free(uart->cts_pin);
-       if (uart->rts_pin >= 0)
-               gpio_free(uart->rts_pin);
        if (UART_GET_IER(uart) && EDSSI)
                free_irq(uart->status_irq, uart);
 #endif
@@ -1409,8 +1396,7 @@ static int bfin_serial_remove(struct platform_device *dev)
                        continue;
                uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
                bfin_serial_ports[i].port.dev = NULL;
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
-       defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
+#if defined(CONFIG_SERIAL_BFIN_CTSRTS)
                gpio_free(bfin_serial_ports[i].cts_pin);
                gpio_free(bfin_serial_ports[i].rts_pin);
 #endif