{"id":261,"url":"http://patchwork.ozlabs.org/api/1.1/patches/261/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1221234176-14937-1-git-send-email-becky.bruce@freescale.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.1/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<1221234176-14937-1-git-send-email-becky.bruce@freescale.com>","date":"2008-09-12T15:42:56","name":"Pass actual dev ptr to dma_* in ucc and cpm_uart serial","commit_ref":"8b05cefca73bfbd98c89f16327f5d7da52ab7c3c","pull_url":null,"state":"accepted","archived":true,"hash":"e86711c2b405b96c17f4fc60e81b6d1d600df2f9","submitter":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.1/people/12/?format=json","name":"Becky Bruce","email":"becky.bruce@freescale.com"},"delegate":{"id":9,"url":"http://patchwork.ozlabs.org/api/1.1/users/9/?format=json","username":"galak","first_name":"Kumar","last_name":"Gala","email":"galak@kernel.crashing.org"},"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1221234176-14937-1-git-send-email-becky.bruce@freescale.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/261/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/261/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["patchwork@ozlabs.org","linuxppc-dev@ozlabs.org"],"Delivered-To":["patchwork@ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from ozlabs.org (localhost [127.0.0.1])\n\tby ozlabs.org (Postfix) with ESMTP id 70AEDDE1FB\n\tfor ; Sat, 13 Sep 2008 01:43:57 +1000 (EST)","from az33egw02.freescale.net (az33egw02.freescale.net\n\t[192.88.158.103])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(Client CN \"az33egw02.freescale.net\",\n\tIssuer \"Thawte Premium Server CA\" (verified OK))\n\tby ozlabs.org (Postfix) with ESMTPS id D2BFBDDF80\n\tfor ; Sat, 13 Sep 2008 01:43:10 +1000 (EST)","from az33smr01.freescale.net (az33smr01.freescale.net\n\t[10.64.34.199])\n\tby az33egw02.freescale.net (8.12.11/az33egw02) with ESMTP id\n\tm8CFh2ZT026131\n\tfor ; Fri, 12 Sep 2008 08:43:03 -0700 (MST)","from blarg.am.freescale.net (blarg.am.freescale.net [10.82.19.176])\n\tby az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id\n\tm8CFgvKN023807\n\tfor ; Fri, 12 Sep 2008 10:43:02 -0500 (CDT)","from blarg.am.freescale.net (localhost.localdomain [127.0.0.1])\n\tby blarg.am.freescale.net (8.14.2/8.14.2) with ESMTP id\n\tm8CFgvrN014960; Fri, 12 Sep 2008 10:42:57 -0500","(from bgill@localhost)\n\tby blarg.am.freescale.net (8.14.2/8.14.2/Submit) id m8CFguOj014958;\n\tFri, 12 Sep 2008 10:42:56 -0500"],"From":"Becky Bruce ","To":"linuxppc-dev@ozlabs.org","Subject":"[PATCH V2] Pass actual dev ptr to dma_* in ucc and cpm_uart serial","Date":"Fri, 12 Sep 2008 10:42:56 -0500","Message-Id":"<1221234176-14937-1-git-send-email-becky.bruce@freescale.com>","X-Mailer":"git-send-email 1.5.5.1","X-BeenThere":"linuxppc-dev@ozlabs.org","X-Mailman-Version":"2.1.11","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org","Errors-To":"linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org"},"content":"We're currently passing NULL, and really shouldn't be.\n\nSigned-off-by: Becky Bruce ","diff":"diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c\nindex 25efca5..a6c4d74 100644\n--- a/drivers/serial/cpm_uart/cpm_uart_core.c\n+++ b/drivers/serial/cpm_uart/cpm_uart_core.c\n@@ -1333,6 +1333,9 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,\n \tif (ret)\n \t\treturn ret;\n \n+\t/* initialize the device pointer for the port */\n+\tpinfo->port.dev = &ofdev->dev;\n+\n \treturn uart_add_one_port(&cpm_reg, &pinfo->port);\n }\n \ndiff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c\nindex 0f0aff0..1b94c56 100644\n--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c\n+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c\n@@ -100,7 +100,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)\n \t\tmem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));\n \t\tdma_addr = (u32)cpm_dpram_phys(mem_addr);\n \t} else\n-\t\tmem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,\n+\t\tmem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,\n \t\t\t\t\t GFP_KERNEL);\n \n \tif (mem_addr == NULL) {\n@@ -127,8 +127,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)\n \n void cpm_uart_freebuf(struct uart_cpm_port *pinfo)\n {\n-\tdma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *\n-\t\t\t\t\t pinfo->rx_fifosize) +\n+\tdma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *\n+\t\t\t\t\t\t\t pinfo->rx_fifosize) +\n \t\t\t L1_CACHE_ALIGN(pinfo->tx_nrfifos *\n \t\t\t\t\t pinfo->tx_fifosize), pinfo->mem_addr,\n \t\t\t pinfo->dma_addr);\ndiff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c\nindex b8db4d3..141c0a3 100644\n--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c\n+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c\n@@ -136,7 +136,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)\n \t\tdma_addr = virt_to_bus(mem_addr);\n \t}\n \telse\n-\t\tmem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,\n+\t\tmem_addr = dma_alloc_coherent(pinfo->port.dev, memsz, &dma_addr,\n \t\t\t\t\t GFP_KERNEL);\n \n \tif (mem_addr == NULL) {\n@@ -163,8 +163,8 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)\n \n void cpm_uart_freebuf(struct uart_cpm_port *pinfo)\n {\n-\tdma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *\n-\t\t\t\t\t pinfo->rx_fifosize) +\n+\tdma_free_coherent(pinfo->port.dev, L1_CACHE_ALIGN(pinfo->rx_nrfifos *\n+\t\t\t\t\t\t\t pinfo->rx_fifosize) +\n \t\t\t L1_CACHE_ALIGN(pinfo->tx_nrfifos *\n \t\t\t\t\t pinfo->tx_fifosize), (void __force *)pinfo->mem_addr,\n \t\t\t pinfo->dma_addr);\ndiff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c\nindex 5c5d18d..539c933 100644\n--- a/drivers/serial/ucc_uart.c\n+++ b/drivers/serial/ucc_uart.c\n@@ -1009,7 +1009,7 @@ static int qe_uart_request_port(struct uart_port *port)\n \trx_size = L1_CACHE_ALIGN(qe_port->rx_nrfifos * qe_port->rx_fifosize);\n \ttx_size = L1_CACHE_ALIGN(qe_port->tx_nrfifos * qe_port->tx_fifosize);\n \n-\tbd_virt = dma_alloc_coherent(NULL, rx_size + tx_size, &bd_dma_addr,\n+\tbd_virt = dma_alloc_coherent(port->dev, rx_size + tx_size, &bd_dma_addr,\n \t\tGFP_KERNEL);\n \tif (!bd_virt) {\n \t\tdev_err(port->dev, \"could not allocate buffer descriptors\\n\");\n@@ -1051,7 +1051,7 @@ static void qe_uart_release_port(struct uart_port *port)\n \t\tcontainer_of(port, struct uart_qe_port, port);\n \tstruct ucc_slow_private *uccs = qe_port->us_private;\n \n-\tdma_free_coherent(NULL, qe_port->bd_size, qe_port->bd_virt,\n+\tdma_free_coherent(port->dev, qe_port->bd_size, qe_port->bd_virt,\n \t\t\t qe_port->bd_dma_addr);\n \n \tucc_slow_free(uccs);\n","prefixes":[]}