[PATCH 1/2] Conversions from kmalloc+memset to k(z|c)alloc

[PATCH 1/2] Conversions from kmalloc+memset to k(z|c)alloc

[Panagiotis Issaris]

From: Panagiotis Issaris <takis@issaris.org>

Conversions from kmalloc+memset to kzalloc.

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
---
Applies to current GIT or 2.6.18-rc2. Compile-tested with 
make allyesconfig.

 drivers/scsi/ide-scsi.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index f9e913f..57f460e 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -326,17 +326,15 @@ static int idescsi_check_condition(ide_d
 	u8             *buf;
 
 	/* stuff a sense request in front of our current request */
-	pc = kmalloc (sizeof (idescsi_pc_t), GFP_ATOMIC);
+	pc = kzalloc (sizeof (idescsi_pc_t), GFP_ATOMIC);
 	rq = kmalloc (sizeof (struct request), GFP_ATOMIC);
-	buf = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
+	buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC);
 	if (pc == NULL || rq == NULL || buf == NULL) {
 		kfree(buf);
 		kfree(rq);
 		kfree(pc);
 		return -ENOMEM;
 	}
-	memset (pc, 0, sizeof (idescsi_pc_t));
-	memset (buf, 0, SCSI_SENSE_BUFFERSIZE);
 	ide_init_drive_cmd(rq);
 	rq->special = (char *) pc;
 	pc->rq = rq;
-- 
1.4.1.gd3ba6

Re: [PATCH 1/2] Conversions from kmalloc+memset to k(z|c)alloc

[Rolf Eike Beer]

Added linux-scsi to CC as it touches drivers/scsi/

>  	/* stuff a sense request in front of our current request */
> -	pc = kmalloc (sizeof (idescsi_pc_t), GFP_ATOMIC);
> +	pc = kzalloc (sizeof (idescsi_pc_t), GFP_ATOMIC);

Please remove the space before the arguments.

>  	rq = kmalloc (sizeof (struct request), GFP_ATOMIC);

This and the one before should be "rq = kzalloc(sizeof(*rq),...);" This way 
you will always get the correct buffer size even if the type of rq changes.

Eike