hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] ipr: Convert to use kzalloc 

Convert appropriate kmalloc/memset calls to use kzalloc.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
brking@us.ibm.com 2005-11-01 17:01:20 -06:00 committed by James Bottomley
parent 622750406a
commit 0bc42e35c7
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/ipr.c
View File

@ -2248,7 +2248,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
num_elem = buf_len / bsize_elem; num_elem = buf_len / bsize_elem;
/* Allocate a scatter/gather list for the DMA */ /* Allocate a scatter/gather list for the DMA */
sglist = kmalloc(sizeof(struct ipr_sglist) + sglist = kzalloc(sizeof(struct ipr_sglist) +
(sizeof(struct scatterlist) * (num_elem - 1)), (sizeof(struct scatterlist) * (num_elem - 1)),
GFP_KERNEL); GFP_KERNEL);
@ -2257,9 +2257,6 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
return NULL; return NULL;
} }
memset(sglist, 0, sizeof(struct ipr_sglist) +
(sizeof(struct scatterlist) * (num_elem - 1)));
scatterlist = sglist->scatterlist; scatterlist = sglist->scatterlist;
sglist->order = order; sglist->order = order;
@ -2614,14 +2611,13 @@ static int ipr_alloc_dump(struct ipr_ioa_cfg *ioa_cfg)
unsigned long lock_flags = 0; unsigned long lock_flags = 0;
ENTER; ENTER;
dump = kmalloc(sizeof(struct ipr_dump), GFP_KERNEL); dump = kzalloc(sizeof(struct ipr_dump), GFP_KERNEL);
if (!dump) { if (!dump) {
ipr_err("Dump memory allocation failed\n"); ipr_err("Dump memory allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }
memset(dump, 0, sizeof(struct ipr_dump));
kref_init(&dump->kref); kref_init(&dump->kref);
dump->ioa_cfg = ioa_cfg; dump->ioa_cfg = ioa_cfg;
@ -5665,15 +5661,12 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
int i, rc = -ENOMEM; int i, rc = -ENOMEM;
ENTER; ENTER;
ioa_cfg->res_entries = kmalloc(sizeof(struct ipr_resource_entry) * ioa_cfg->res_entries = kzalloc(sizeof(struct ipr_resource_entry) *
IPR_MAX_PHYSICAL_DEVS, GFP_KERNEL); IPR_MAX_PHYSICAL_DEVS, GFP_KERNEL);
if (!ioa_cfg->res_entries) if (!ioa_cfg->res_entries)
goto out; goto out;
memset(ioa_cfg->res_entries, 0,
sizeof(struct ipr_resource_entry) * IPR_MAX_PHYSICAL_DEVS);
for (i = 0; i < IPR_MAX_PHYSICAL_DEVS; i++) for (i = 0; i < IPR_MAX_PHYSICAL_DEVS; i++)
list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q); list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q);
@ -5714,15 +5707,12 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
list_add_tail(&ioa_cfg->hostrcb[i]->queue, &ioa_cfg->hostrcb_free_q); list_add_tail(&ioa_cfg->hostrcb[i]->queue, &ioa_cfg->hostrcb_free_q);
} }
ioa_cfg->trace = kmalloc(sizeof(struct ipr_trace_entry) * ioa_cfg->trace = kzalloc(sizeof(struct ipr_trace_entry) *
IPR_NUM_TRACE_ENTRIES, GFP_KERNEL); IPR_NUM_TRACE_ENTRIES, GFP_KERNEL);
if (!ioa_cfg->trace) if (!ioa_cfg->trace)
goto out_free_hostrcb_dma; goto out_free_hostrcb_dma;
memset(ioa_cfg->trace, 0,
sizeof(struct ipr_trace_entry) * IPR_NUM_TRACE_ENTRIES);
rc = 0; rc = 0;
out: out:
LEAVE; LEAVE;