Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-30 00:34:35 +00:00
Code Issues Projects Releases Wiki Activity

[SCSI] zfcp: (cleanup) kmalloc/kzalloc replacement

Browse source 
Replace kmalloc/memset by kzalloc or kcalloc.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Andreas Herrmann 2006-05-22 18:17:30 +02:00 committed by James Bottomley
parent ca3271b402
commit ec4081c6ba
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/s390/scsi/zfcp_aux.c
View file

@ -289,12 +289,11 @@ zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
goto out; goto out;
} }
sg_list = kmalloc(sizeof(struct zfcp_sg_list), GFP_KERNEL); sg_list = kzalloc(sizeof(struct zfcp_sg_list), GFP_KERNEL);
if (sg_list == NULL) { if (sg_list == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto out; goto out;
} }
memset(sg_list, 0, sizeof(*sg_list));
if (command != ZFCP_CFDC_IOC) { if (command != ZFCP_CFDC_IOC) {
ZFCP_LOG_INFO("IOC request code 0x%x invalid\n", command); ZFCP_LOG_INFO("IOC request code 0x%x invalid\n", command);
@ -476,14 +475,13 @@ zfcp_sg_list_alloc(struct zfcp_sg_list *sg_list, size_t size)
sg_list->count = size >> PAGE_SHIFT; sg_list->count = size >> PAGE_SHIFT;
if (size & ~PAGE_MASK) if (size & ~PAGE_MASK)
sg_list->count++; sg_list->count++;
sg_list->sg = kmalloc(sg_list->count * sizeof(struct scatterlist), sg_list->sg = kcalloc(sg_list->count, sizeof(struct scatterlist),
GFP_KERNEL); GFP_KERNEL);
if (sg_list->sg == NULL) { if (sg_list->sg == NULL) {
sg_list->count = 0; sg_list->count = 0;
retval = -ENOMEM; retval = -ENOMEM;
goto out; goto out;
} }
memset(sg_list->sg, 0, sg_list->count * sizeof(struct scatterlist));
for (i = 0, sg = sg_list->sg; i < sg_list->count; i++, sg++) { for (i = 0, sg = sg_list->sg; i < sg_list->count; i++, sg++) {
sg->length = min(size, PAGE_SIZE); sg->length = min(size, PAGE_SIZE);
@ -756,10 +754,9 @@ zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
if (unit) if (unit)
return NULL; return NULL;
unit = kmalloc(sizeof (struct zfcp_unit), GFP_KERNEL); unit = kzalloc(sizeof (struct zfcp_unit), GFP_KERNEL);
if (!unit) if (!unit)
return NULL; return NULL;
memset(unit, 0, sizeof (struct zfcp_unit));
/* initialise reference count stuff */ /* initialise reference count stuff */
atomic_set(&unit->refcount, 0); atomic_set(&unit->refcount, 0);
@ -927,13 +924,12 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
*/ */
/* try to allocate new adapter data structure (zeroed) */ /* try to allocate new adapter data structure (zeroed) */
adapter = kmalloc(sizeof (struct zfcp_adapter), GFP_KERNEL); adapter = kzalloc(sizeof (struct zfcp_adapter), GFP_KERNEL);
if (!adapter) { if (!adapter) {
ZFCP_LOG_INFO("error: allocation of base adapter " ZFCP_LOG_INFO("error: allocation of base adapter "
"structure failed\n"); "structure failed\n");
goto out; goto out;
} }
memset(adapter, 0, sizeof (struct zfcp_adapter));
ccw_device->handler = NULL; ccw_device->handler = NULL;
@ -1137,10 +1133,9 @@ zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn, u32 status,
return NULL; return NULL;
} }
port = kmalloc(sizeof (struct zfcp_port), GFP_KERNEL); port = kzalloc(sizeof (struct zfcp_port), GFP_KERNEL);
if (!port) if (!port)
return NULL; return NULL;
memset(port, 0, sizeof (struct zfcp_port));
/* initialise reference count stuff */ /* initialise reference count stuff */
atomic_set(&port->refcount, 0); atomic_set(&port->refcount, 0);

9
drivers/s390/scsi/zfcp_erp.c
View file

@ -275,20 +275,17 @@ zfcp_erp_adisc(struct zfcp_port *port)
int retval = 0; int retval = 0;
struct timer_list *timer; struct timer_list *timer;
send_els = kmalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC); send_els = kzalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC);
if (send_els == NULL) if (send_els == NULL)
goto nomem; goto nomem;
memset(send_els, 0, sizeof(*send_els));
send_els->req = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC); send_els->req = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);
if (send_els->req == NULL) if (send_els->req == NULL)
goto nomem; goto nomem;
memset(send_els->req, 0, sizeof(*send_els->req));
send_els->resp = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC); send_els->resp = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);
if (send_els->resp == NULL) if (send_els->resp == NULL)
goto nomem; goto nomem;
memset(send_els->resp, 0, sizeof(*send_els->resp));
address = (void *) get_zeroed_page(GFP_ATOMIC); address = (void *) get_zeroed_page(GFP_ATOMIC);
if (address == NULL) if (address == NULL)

6
drivers/s390/scsi/zfcp_scsi.c
View file

@ -761,10 +761,9 @@ zfcp_get_fc_host_stats(struct Scsi_Host *shost)
if (!fc_stats) if (!fc_stats)
return NULL; return NULL;
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
return NULL; return NULL;
memset(data, 0, sizeof(*data));
ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
if (ret) { if (ret) {
@ -792,10 +791,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
int ret; int ret;
adapter = (struct zfcp_adapter *)shost->hostdata[0]; adapter = (struct zfcp_adapter *)shost->hostdata[0];
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
return; return;
memset(data, 0, sizeof(*data));
ret = zfcp_fsf_exchange_port_data(NULL, adapter, data); ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
if (ret == 0) { if (ret == 0) {