serial: 8250_dw: hook the DMA in one place

Instead of assigning the dma member in dw8250_probe_of and
dw8250_probe_acpi separately, assigning it in dw8250_probe.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 346061718e91..d69d0984484f 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -302,14 +302,6 @@ static int dw8250_probe_of(struct uart_port *p,
         if (has_ucv)
                 dw8250_setup_port(up);
 
-        /* if we have a valid fifosize, try hooking up DMA here */
-        if (p->fifosize) {
-                up->dma = &data->dma;
-
-                up->dma->rxconf.src_maxburst = p->fifosize / 4;
-                up->dma->txconf.dst_maxburst = p->fifosize / 4;
-        }
-
         /* get index of serial line, if found in DT aliases */
         id = of_alias_get_id(np, "serial");
         if (id >= 0)
@@ -348,10 +340,6 @@ static int dw8250_probe_acpi(struct uart_8250_port *up,
                 data->dma.fn = dw8250_idma_filter;
         }
 
-        up->dma = &data->dma;
-        up->dma->rxconf.src_maxburst = p->fifosize / 4;
-        up->dma->txconf.dst_maxburst = p->fifosize / 4;
-
         up->port.set_termios = dw8250_set_termios;
 
         return 0;
@@ -498,6 +486,13 @@ static int dw8250_probe(struct platform_device *pdev)
                 goto err_reset;
         }
 
+        /* If we have a valid fifosize, try hooking up DMA */
+        if (p->fifosize) {
+                data->dma.rxconf.src_maxburst = p->fifosize / 4;
+                data->dma.txconf.dst_maxburst = p->fifosize / 4;
+                uart.dma = &data->dma;
+        }
+
         data->line = serial8250_register_8250_port(&uart);
         if (data->line < 0) {
                 err = data->line;