aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_erp.c
diff options
context:
space:
mode:
authorAndreas Herrmann <aherrman@de.ibm.com>2006-05-22 12:17:30 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-28 12:42:52 -0400
commitec4081c6ba4fba6a8bc12a0e93db8817ba63ce47 (patch)
tree9aa5953a42fac103d216a08688bffe8f57029f8d /drivers/s390/scsi/zfcp_erp.c
parentca3271b40225a1049334766f6fb35b57a0162bd2 (diff)
[SCSI] zfcp: (cleanup) kmalloc/kzalloc replacement
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>
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
-rw-r--r--drivers/s390/scsi/zfcp_erp.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index f57440c96e27..ea2e7a398892 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -275,20 +275,17 @@ zfcp_erp_adisc(struct zfcp_port *port)
275 int retval = 0; 275 int retval = 0;
276 struct timer_list *timer; 276 struct timer_list *timer;
277 277
278 send_els = kmalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC); 278 send_els = kzalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC);
279 if (send_els == NULL) 279 if (send_els == NULL)
280 goto nomem; 280 goto nomem;
281 memset(send_els, 0, sizeof(*send_els));
282 281
283 send_els->req = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC); 282 send_els->req = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);
284 if (send_els->req == NULL) 283 if (send_els->req == NULL)
285 goto nomem; 284 goto nomem;
286 memset(send_els->req, 0, sizeof(*send_els->req));
287 285
288 send_els->resp = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC); 286 send_els->resp = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);
289 if (send_els->resp == NULL) 287 if (send_els->resp == NULL)
290 goto nomem; 288 goto nomem;
291 memset(send_els->resp, 0, sizeof(*send_els->resp));
292 289
293 address = (void *) get_zeroed_page(GFP_ATOMIC); 290 address = (void *) get_zeroed_page(GFP_ATOMIC);
294 if (address == NULL) 291 if (address == NULL)