From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Olof Johansson <olof@lixom.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH -next 01/26] powerpc: Use dma_zalloc_coherent
Date: Sun, 15 Jun 2014 13:37:30 -0700 [thread overview]
Message-ID: <ceb2b3214fbb7c5ea5e356d35df4d0b38b90a41a.1402863905.git.joe@perches.com> (raw)
In-Reply-To: <cover.1402863904.git.joe@perches.com>
Use the zeroing function instead of dma_alloc_coherent & memset(,0,)
Signed-off-by: Joe Perches <joe@perches.com>
---
arch/powerpc/platforms/pasemi/dma_lib.c | 8 +++-----
arch/powerpc/sysdev/fsl_rmu.c | 9 ++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index aafa01ba..52b391f 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -255,15 +255,13 @@ int pasemi_dma_alloc_ring(struct pasemi_dmachan *chan, int ring_size)
chan->ring_size = ring_size;
- chan->ring_virt = dma_alloc_coherent(&dma_pdev->dev,
- ring_size * sizeof(u64),
- &chan->ring_dma, GFP_KERNEL);
+ chan->ring_virt = dma_zalloc_coherent(&dma_pdev->dev,
+ ring_size * sizeof(u64),
+ &chan->ring_dma, GFP_KERNEL);
if (!chan->ring_virt)
return -ENOMEM;
- memset(chan->ring_virt, 0, ring_size * sizeof(u64));
-
return 0;
}
EXPORT_SYMBOL(pasemi_dma_alloc_ring);
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index b48197a..34b49fc 100644
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -744,15 +744,14 @@ fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
}
/* Initialize outbound message descriptor ring */
- rmu->msg_tx_ring.virt = dma_alloc_coherent(priv->dev,
- rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
- &rmu->msg_tx_ring.phys, GFP_KERNEL);
+ rmu->msg_tx_ring.virt = dma_zalloc_coherent(priv->dev,
+ rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
+ &rmu->msg_tx_ring.phys,
+ GFP_KERNEL);
if (!rmu->msg_tx_ring.virt) {
rc = -ENOMEM;
goto out_dma;
}
- memset(rmu->msg_tx_ring.virt, 0,
- rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE);
rmu->msg_tx_ring.tx_slot = 0;
/* Point dequeue/enqueue pointers at first entry in ring */
--
1.8.1.2.459.gbcd45b4.dirty
next prev parent reply other threads:[~2014-06-15 20:38 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-15 20:37 [PATCH -next 00/26] treewide: " Joe Perches
2014-06-15 20:37 ` Joe Perches [this message]
2014-06-15 20:37 ` [PATCH -next 02/26] sh: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 03/26] ata: " Joe Perches
2014-06-17 14:23 ` Tejun Heo
2014-06-15 20:37 ` [PATCH -next 04/26] block: " Joe Perches
2014-06-28 12:52 ` Matthew Wilcox
2014-06-15 20:37 ` [PATCH -next 05/26] crypto: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 06/26] dma: " Joe Perches
2014-07-14 17:00 ` Vinod Koul
2014-06-15 20:37 ` [PATCH -next 07/26] gpu: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 08/26] infiniband: " Joe Perches
2014-06-16 13:20 ` Steve Wise
2014-06-15 20:37 ` [PATCH -next 09/26] mmc: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 10/26] broadcom: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 11/26] hisilicon: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 12/26] intel: " Joe Perches
2014-06-16 21:15 ` Jeff Kirsher
2014-06-15 20:37 ` [PATCH -next 13/26] ath: " Joe Perches
2014-06-16 9:24 ` Kalle Valo
2014-06-15 20:37 ` [PATCH -next 14/26] rt2x00: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 15/26] bfa: " Joe Perches
2014-06-16 6:31 ` Anil Gurumurthy
2014-06-15 20:37 ` [PATCH -next 16/26] bnx2fc: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 17/26] bnx2i: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 18/26] dpt_i2o: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 19/26] lpfc: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 20/26] megaraid: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 21/26] mvsas: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 22/26] qla2xxx: " Joe Perches
2014-06-16 6:16 ` Saurav Kashyap
2014-06-15 20:37 ` [PATCH -next 23/26] qla4xxx: " Joe Perches
2014-06-15 20:37 ` [PATCH -next 24/26] usb: " Joe Perches
2014-06-15 22:02 ` Alan Stern
2014-06-15 23:32 ` Joe Perches
2014-06-16 22:00 ` Paul Zimmerman
2014-06-17 0:30 ` Joe Perches
2014-06-15 20:37 ` [PATCH -next 25/26] fbdev: " Joe Perches
2014-06-15 22:16 ` Geert Uytterhoeven
2014-06-15 23:32 ` Joe Perches
2014-06-23 11:53 ` Tomi Valkeinen
2014-06-15 20:37 ` [PATCH -next 26/26] sound: " Joe Perches
2014-06-16 9:40 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ceb2b3214fbb7c5ea5e356d35df4d0b38b90a41a.1402863905.git.joe@perches.com \
--to=joe@perches.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=olof@lixom.net \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®