Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / tty / serial / bfin_uart.c

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index e08bc046c1bd4279994b8e3fa19f1c3c0142b9d9..66afb98b77b50f6d84fbeb398a231c6d62e02524 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -667,17 +667,17 @@ static int bfin_serial_startup(struct uart_port *port)
                kgdboc_break_enabled = 0;
        else {
 # endif
-       if (request_irq(uart->port.irq, bfin_serial_rx_int, IRQF_DISABLED,
+       if (request_irq(uart->rx_irq, bfin_serial_rx_int, 0,
             "BFIN_UART_RX", uart)) {
                printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
                return -EBUSY;
        }
 
        if (request_irq
-           (uart->port.irq+1, bfin_serial_tx_int, IRQF_DISABLED,
+           (uart->tx_irq, bfin_serial_tx_int, 0,
             "BFIN_UART_TX", uart)) {
                printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
-               free_irq(uart->port.irq, uart);
+               free_irq(uart->rx_irq, uart);
                return -EBUSY;
        }
 
@@ -692,7 +692,7 @@ static int bfin_serial_startup(struct uart_port *port)
                 */
                unsigned uart_dma_ch_rx, uart_dma_ch_tx;
 
-               switch (uart->port.irq) {
+               switch (uart->rx_irq) {
                case IRQ_UART3_RX:
                        uart_dma_ch_rx = CH_UART3_RX;
                        uart_dma_ch_tx = CH_UART3_TX;
@@ -709,16 +709,16 @@ static int bfin_serial_startup(struct uart_port *port)
                if (uart_dma_ch_rx &&
                        request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {
                        printk(KERN_NOTICE"Fail to attach UART interrupt\n");
-                       free_irq(uart->port.irq, uart);
-                       free_irq(uart->port.irq + 1, uart);
+                       free_irq(uart->rx_irq, uart);
+                       free_irq(uart->tx_irq, uart);
                        return -EBUSY;
                }
                if (uart_dma_ch_tx &&
                        request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) {
                        printk(KERN_NOTICE "Fail to attach UART interrupt\n");
                        free_dma(uart_dma_ch_rx);
-                       free_irq(uart->port.irq, uart);
-                       free_irq(uart->port.irq + 1, uart);
+                       free_irq(uart->rx_irq, uart);
+                       free_irq(uart->tx_irq, uart);
                        return -EBUSY;
                }
        }
@@ -734,7 +734,7 @@ static int bfin_serial_startup(struct uart_port *port)
                if (request_irq(gpio_to_irq(uart->cts_pin),
                        bfin_serial_mctrl_cts_int,
                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
-                       IRQF_DISABLED, "BFIN_UART_CTS", uart)) {
+                       0, "BFIN_UART_CTS", uart)) {
                        uart->cts_pin = -1;
                        pr_info("Unable to attach BlackFin UART CTS interrupt. So, disable it.\n");
                }
@@ -745,7 +745,7 @@ static int bfin_serial_startup(struct uart_port *port)
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
        if (uart->cts_pin >= 0 && request_irq(uart->status_irq,
                bfin_serial_mctrl_cts_int,
-               IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) {
+               0, "BFIN_UART_MODEM_STATUS", uart)) {
                uart->cts_pin = -1;
                pr_info("Unable to attach BlackFin UART Modem Status interrupt.\n");
        }
@@ -785,8 +785,8 @@ static void bfin_serial_shutdown(struct uart_port *port)
                break;
        };
 #endif
-       free_irq(uart->port.irq, uart);
-       free_irq(uart->port.irq+1, uart);
+       free_irq(uart->rx_irq, uart);
+       free_irq(uart->tx_irq, uart);
 #endif
 
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
@@ -1319,14 +1319,22 @@ static int bfin_serial_probe(struct platform_device *pdev)
                }
                uart->port.mapbase = res->start;
 
-               uart->port.irq = platform_get_irq(pdev, 0);
-               if (uart->port.irq < 0) {
-                       dev_err(&pdev->dev, "No uart RX/TX IRQ specified\n");
+               uart->tx_irq = platform_get_irq(pdev, 0);
+               if (uart->tx_irq < 0) {
+                       dev_err(&pdev->dev, "No uart TX IRQ specified\n");
                        ret = -ENOENT;
                        goto out_error_unmap;
                }
 
-               uart->status_irq = platform_get_irq(pdev, 1);
+               uart->rx_irq = platform_get_irq(pdev, 1);
+               if (uart->rx_irq < 0) {
+                       dev_err(&pdev->dev, "No uart RX IRQ specified\n");
+                       ret = -ENOENT;
+                       goto out_error_unmap;
+               }
+               uart->port.irq = uart->rx_irq;
+
+               uart->status_irq = platform_get_irq(pdev, 2);
                if (uart->status_irq < 0) {
                        dev_err(&pdev->dev, "No uart status IRQ specified\n");
                        ret = -ENOENT;