cpm_uart: Pass actual dev ptr to dma_* in ucc and cpm_uart serial

We're currently passing NULL, and really shouldn't be.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Acked-By: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

3 files changed, 9 insertions, 6 deletions

diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 25efca5a7a1f..a6c4d744495e 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
         if (ret)
                 return ret;
 
+        /* initialize the device pointer for the port */
+        pinfo->port.dev = &ofdev->dev;
+
         return uart_add_one_port(&cpm_reg, &pinfo->port);
 }
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 0f0aff06c596..1b94c56ec239 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -100,7 +100,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
                 dma_addr = (u32)cpm_dpram_phys(mem_addr);
         } else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -127,8 +127,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), pinfo->mem_addr,
                           pinfo->dma_addr);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b8db4d3eed36..141c0a3333ad 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -136,7 +136,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 dma_addr = virt_to_bus(mem_addr);
         }
         else
-                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                mem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,
                                               GFP_KERNEL);
 
         if (mem_addr == NULL) {
@@ -163,8 +163,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
 
 void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 {
-        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
-                                               pinfo->rx_fifosize) +
+        dma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                                          pinfo->rx_fifosize) +
                           L1_CACHE_ALIGN(pinfo->tx_nrfifos *
                                          pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,
                           pinfo->dma_addr);