Staging: Use kcalloc or kzalloc

Use kcalloc or kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,y,flags;
statement S;
type T;
@@

x =
-   kmalloc
+   kcalloc
           (
-           y * sizeof(T),
+           y, sizeof(T),
                flags);
 if (x == NULL) S
-memset(x, 0, y * sizeof(T));

@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

4 files changed, 7 insertions, 15 deletions

diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/go7007/go7007-fw.c
index ee622ff1707..c9a6409edfe 100644
--- a/drivers/staging/go7007/go7007-fw.c
+++ b/drivers/staging/go7007/go7007-fw.c
@@ -380,13 +380,12 @@ static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
         unsigned int addr = 0x19;
         int size = 0, i, off = 0, chunk;
 
-        buf = kmalloc(4096, GFP_KERNEL);
+        buf = kzalloc(4096, GFP_KERNEL);
         if (buf == NULL) {
                 printk(KERN_ERR "go7007: unable to allocate 4096 bytes for "
                                 "firmware construction\n");
                 return -1;
         }
-        memset(buf, 0, 4096);
 
         for (i = 1; i < 32; ++i) {
                 mjpeg_frame_header(go, buf + size, i);
@@ -651,13 +650,12 @@ static int gen_mpeg1hdr_to_package(struct go7007 *go,
         unsigned int addr = 0x19;
         int i, off = 0, chunk;
 
-        buf = kmalloc(5120, GFP_KERNEL);
+        buf = kzalloc(5120, GFP_KERNEL);
         if (buf == NULL) {
                 printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "
                                 "firmware construction\n");
                 return -1;
         }
-        memset(buf, 0, 5120);
         framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);
         if (go->interlace_coding)
                 framelen[0] += mpeg1_frame_header(go, buf + framelen[0] / 8,
@@ -839,13 +837,12 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
         unsigned int addr = 0x19;
         int i, off = 0, chunk;
 
-        buf = kmalloc(5120, GFP_KERNEL);
+        buf = kzalloc(5120, GFP_KERNEL);
         if (buf == NULL) {
                 printk(KERN_ERR "go7007: unable to allocate 5120 bytes for "
                                 "firmware construction\n");
                 return -1;
         }
-        memset(buf, 0, 5120);
         framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);
         i = 368;
         framelen[1] = mpeg4_frame_header(go, buf + i, 0, BFRAME_PRE);
@@ -1585,13 +1582,12 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
                         go->board_info->firmware);
                 return -1;
         }
-        code = kmalloc(codespace * 2, GFP_KERNEL);
+        code = kzalloc(codespace * 2, GFP_KERNEL);
         if (code == NULL) {
                 printk(KERN_ERR "go7007: unable to allocate %d bytes for "
                                 "firmware construction\n", codespace * 2);
                 goto fw_failed;
         }
-        memset(code, 0, codespace * 2);
         src = (__le16 *)fw_entry->data;
         srclen = fw_entry->size / 2;
         while (srclen >= 2) {
diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c
index ee278f64a16..20ed930b588 100644
--- a/drivers/staging/go7007/go7007-usb.c
+++ b/drivers/staging/go7007/go7007-usb.c
@@ -670,10 +670,9 @@ static int go7007_usb_onboard_write_interrupt(struct go7007 *go,
                 "go7007-usb: WriteInterrupt: %04x %04x\n", addr, data);
 #endif
 
-        tbuf = kmalloc(8, GFP_KERNEL);
+        tbuf = kzalloc(8, GFP_KERNEL);
         if (tbuf == NULL)
                 return -ENOMEM;
-        memset(tbuf, 0, 8);
         tbuf[0] = data & 0xff;
         tbuf[1] = data >> 8;
         tbuf[2] = addr & 0xff;
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index 723c1a64d87..46b4b9f6855 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -720,7 +720,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                 if (count > 32)
                         count = 32;
 
-                gofh->bufs = kmalloc(count * sizeof(struct go7007_buffer),
+                gofh->bufs = kcalloc(count, sizeof(struct go7007_buffer),
                                      GFP_KERNEL);
 
                 if (!gofh->bufs) {
@@ -728,8 +728,6 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                         goto unlock_and_return;
                 }
 
-                memset(gofh->bufs, 0, count * sizeof(struct go7007_buffer));
-
                 for (i = 0; i < count; ++i) {
                         gofh->bufs[i].go = go;
                         gofh->bufs[i].index = i;
diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
index b25d7d2090e..49f0d31c118 100644
--- a/drivers/staging/go7007/saa7134-go7007.c
+++ b/drivers/staging/go7007/saa7134-go7007.c
@@ -440,10 +440,9 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
 
         printk(KERN_DEBUG "saa7134-go7007: probing new SAA713X board\n");
 
-        saa = kmalloc(sizeof(struct saa7134_go7007), GFP_KERNEL);
+        saa = kzalloc(sizeof(struct saa7134_go7007), GFP_KERNEL);
         if (saa == NULL)
                 return -ENOMEM;
-        memset(saa, 0, sizeof(struct saa7134_go7007));
 
         /* Allocate a couple pages for receiving the compressed stream */
         saa->top = (u8 *)get_zeroed_page(GFP_KERNEL);