diff options
author | Salyzyn, Mark <mark_salyzyn@adaptec.com> | 2007-04-16 11:21:50 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-06 10:33:11 -0400 |
commit | 4dbc22d7a9644088266a579433a3d621142a01e9 (patch) | |
tree | 619da605dfb99caaa50688f4c456a33145cc5c42 /drivers/scsi/aacraid/dpcsup.c | |
parent | ab552204599d311988be89fe0bbbe5ea9d84184a (diff) |
[SCSI] aacraid: kmalloc/memset->kzalloc
Inspired somewhat by Vignesh Babu <vignesh.babu@wipro.com> patch to
dpt_i2o.c to replace kmalloc/memset sequences with kzalloc, doing the
same for the aacraid driver.
Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid/dpcsup.c')
-rw-r--r-- | drivers/scsi/aacraid/dpcsup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c index 42c7dcda6d9b..fcd25f7d0bc6 100644 --- a/drivers/scsi/aacraid/dpcsup.c +++ b/drivers/scsi/aacraid/dpcsup.c | |||
@@ -248,16 +248,14 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index) | |||
248 | * manage the linked lists. | 248 | * manage the linked lists. |
249 | */ | 249 | */ |
250 | if ((!dev->aif_thread) | 250 | if ((!dev->aif_thread) |
251 | || (!(fib = kmalloc(sizeof(struct fib),GFP_ATOMIC)))) | 251 | || (!(fib = kzalloc(sizeof(struct fib),GFP_ATOMIC)))) |
252 | return 1; | 252 | return 1; |
253 | if (!(hw_fib = kmalloc(sizeof(struct hw_fib),GFP_ATOMIC))) { | 253 | if (!(hw_fib = kzalloc(sizeof(struct hw_fib),GFP_ATOMIC))) { |
254 | kfree (fib); | 254 | kfree (fib); |
255 | return 1; | 255 | return 1; |
256 | } | 256 | } |
257 | memset(hw_fib, 0, sizeof(struct hw_fib)); | ||
258 | memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) + | 257 | memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) + |
259 | (index & ~0x00000002L)), sizeof(struct hw_fib)); | 258 | (index & ~0x00000002L)), sizeof(struct hw_fib)); |
260 | memset(fib, 0, sizeof(struct fib)); | ||
261 | INIT_LIST_HEAD(&fib->fiblink); | 259 | INIT_LIST_HEAD(&fib->fiblink); |
262 | fib->type = FSAFS_NTC_FIB_CONTEXT; | 260 | fib->type = FSAFS_NTC_FIB_CONTEXT; |
263 | fib->size = sizeof(struct fib); | 261 | fib->size = sizeof(struct fib); |