From: Alexander Beregalov <a.beregalov@gmail.com>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org,
Alexander Beregalov <a.beregalov@gmail.com>
Subject: [PATCH next 3/5] staging: spectra: optimize kmalloc to kzalloc
Date: Wed, 9 Mar 2011 03:53:36 +0300 [thread overview]
Message-ID: <1299632018-6774-3-git-send-email-a.beregalov@gmail.com> (raw)
In-Reply-To: <1299632018-6774-1-git-send-email-a.beregalov@gmail.com>
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/staging/spectra/flash.c | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c
index f11197b..a2f8200 100644
--- a/drivers/staging/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
@@ -428,10 +428,9 @@ static int allocate_memory(void)
DeviceInfo.wPageDataSize;
/* Malloc memory for block tables */
- g_pBlockTable = kmalloc(block_table_size, GFP_ATOMIC);
+ g_pBlockTable = kzalloc(block_table_size, GFP_ATOMIC);
if (!g_pBlockTable)
goto block_table_fail;
- memset(g_pBlockTable, 0, block_table_size);
total_bytes += block_table_size;
g_pWearCounter = (u8 *)(g_pBlockTable +
@@ -447,19 +446,17 @@ static int allocate_memory(void)
Cache.array[i].address = NAND_CACHE_INIT_ADDR;
Cache.array[i].use_cnt = 0;
Cache.array[i].changed = CLEAR;
- Cache.array[i].buf = kmalloc(Cache.cache_item_size,
- GFP_ATOMIC);
+ Cache.array[i].buf = kzalloc(Cache.cache_item_size,
+ GFP_ATOMIC);
if (!Cache.array[i].buf)
goto cache_item_fail;
- memset(Cache.array[i].buf, 0, Cache.cache_item_size);
total_bytes += Cache.cache_item_size;
}
/* Malloc memory for IPF */
- g_pIPF = kmalloc(page_size, GFP_ATOMIC);
+ g_pIPF = kzalloc(page_size, GFP_ATOMIC);
if (!g_pIPF)
goto ipf_fail;
- memset(g_pIPF, 0, page_size);
total_bytes += page_size;
/* Malloc memory for data merging during Level2 Cache flush */
@@ -476,10 +473,9 @@ static int allocate_memory(void)
total_bytes += block_size;
/* Malloc memory for temp buffer */
- g_pTempBuf = kmalloc(Cache.cache_item_size, GFP_ATOMIC);
+ g_pTempBuf = kzalloc(Cache.cache_item_size, GFP_ATOMIC);
if (!g_pTempBuf)
goto Temp_buf_fail;
- memset(g_pTempBuf, 0, Cache.cache_item_size);
total_bytes += Cache.cache_item_size;
/* Malloc memory for block table blocks */
@@ -589,10 +585,9 @@ static int allocate_memory(void)
total_bytes += block_size;
/* Malloc memory for copy of block table used in CDMA mode */
- g_pBTStartingCopy = kmalloc(block_table_size, GFP_ATOMIC);
+ g_pBTStartingCopy = kzalloc(block_table_size, GFP_ATOMIC);
if (!g_pBTStartingCopy)
goto bt_starting_copy;
- memset(g_pBTStartingCopy, 0, block_table_size);
total_bytes += block_table_size;
g_pWearCounterCopy = (u8 *)(g_pBTStartingCopy +
@@ -608,28 +603,25 @@ static int allocate_memory(void)
5 * DeviceInfo.wDataBlockNum * sizeof(u8);
if (DeviceInfo.MLCDevice)
mem_size += 5 * DeviceInfo.wDataBlockNum * sizeof(u16);
- g_pBlockTableCopies = kmalloc(mem_size, GFP_ATOMIC);
+ g_pBlockTableCopies = kzalloc(mem_size, GFP_ATOMIC);
if (!g_pBlockTableCopies)
goto blk_table_copies_fail;
- memset(g_pBlockTableCopies, 0, mem_size);
total_bytes += mem_size;
g_pNextBlockTable = g_pBlockTableCopies;
/* Malloc memory for Block Table Delta */
mem_size = MAX_DESCS * sizeof(struct BTableChangesDelta);
- g_pBTDelta = kmalloc(mem_size, GFP_ATOMIC);
+ g_pBTDelta = kzalloc(mem_size, GFP_ATOMIC);
if (!g_pBTDelta)
goto bt_delta_fail;
- memset(g_pBTDelta, 0, mem_size);
total_bytes += mem_size;
g_pBTDelta_Free = g_pBTDelta;
/* Malloc memory for Copy Back Buffers */
for (j = 0; j < COPY_BACK_BUF_NUM; j++) {
- cp_back_buf_copies[j] = kmalloc(block_size, GFP_ATOMIC);
+ cp_back_buf_copies[j] = kzalloc(block_size, GFP_ATOMIC);
if (!cp_back_buf_copies[j])
goto cp_back_buf_copies_fail;
- memset(cp_back_buf_copies[j], 0, block_size);
total_bytes += block_size;
}
cp_back_buf_idx = 0;
--
1.7.4.1
next prev parent reply other threads:[~2011-03-09 0:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-09 0:53 [PATCH next 1/5] staging: bcm: " Alexander Beregalov
2011-03-09 0:53 ` [PATCH next 2/5] staging: brcm80211: " Alexander Beregalov
2011-03-09 0:53 ` Alexander Beregalov [this message]
2011-03-09 0:53 ` [PATCH next 4/5] staging: ft1000: " Alexander Beregalov
2011-03-09 0:53 ` [PATCH next 5/5] staging: rts_pstor: " Alexander Beregalov
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=1299632018-6774-3-git-send-email-a.beregalov@gmail.com \
--to=a.beregalov@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.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®