mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: qla2xxx-upstream@qlogic.com,
	"James E.J. Bottomley" <JBottomley@parallels.com>,
	linux-scsi@vger.kernel.org
Subject: [PATCH -next 22/26] qla2xxx: Use dma_zalloc_coherent
Date: Sun, 15 Jun 2014 13:37:51 -0700	[thread overview]
Message-ID: <5e845f43a014ad7dd4ab3a4fdcd95b879bc496ef.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>
---
 drivers/scsi/qla2xxx/qla_init.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index e218441..46990f4 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1526,8 +1526,8 @@ try_fce:
 			    FCE_SIZE, ha->fce, ha->fce_dma);
 
 		/* Allocate memory for Fibre Channel Event Buffer. */
-		tc = dma_alloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
-		    GFP_KERNEL);
+		tc = dma_zalloc_coherent(&ha->pdev->dev, FCE_SIZE, &tc_dma,
+					 GFP_KERNEL);
 		if (!tc) {
 			ql_log(ql_log_warn, vha, 0x00be,
 			    "Unable to allocate (%d KB) for FCE.\n",
@@ -1535,7 +1535,6 @@ try_fce:
 			goto try_eft;
 		}
 
-		memset(tc, 0, FCE_SIZE);
 		rval = qla2x00_enable_fce_trace(vha, tc_dma, FCE_NUM_BUFFERS,
 		    ha->fce_mb, &ha->fce_bufs);
 		if (rval) {
@@ -1560,8 +1559,8 @@ try_eft:
 			    EFT_SIZE, ha->eft, ha->eft_dma);
 
 		/* Allocate memory for Extended Trace Buffer. */
-		tc = dma_alloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
-		    GFP_KERNEL);
+		tc = dma_zalloc_coherent(&ha->pdev->dev, EFT_SIZE, &tc_dma,
+					 GFP_KERNEL);
 		if (!tc) {
 			ql_log(ql_log_warn, vha, 0x00c1,
 			    "Unable to allocate (%d KB) for EFT.\n",
@@ -1569,7 +1568,6 @@ try_eft:
 			goto cont_alloc;
 		}
 
-		memset(tc, 0, EFT_SIZE);
 		rval = qla2x00_enable_eft_trace(vha, tc_dma, EFT_NUM_BUFFERS);
 		if (rval) {
 			ql_log(ql_log_warn, vha, 0x00c2,
-- 
1.8.1.2.459.gbcd45b4.dirty


  parent reply	other threads:[~2014-06-15 20:41 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 ` [PATCH -next 01/26] powerpc: " Joe Perches
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 ` Joe Perches [this message]
2014-06-16  6:16   ` [PATCH -next 22/26] qla2xxx: " 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=5e845f43a014ad7dd4ab3a4fdcd95b879bc496ef.1402863905.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=JBottomley@parallels.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=qla2xxx-upstream@qlogic.com \
    /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®