some kmalloc/memset ->kzalloc (tree wide)

Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc).

Here is a short excerpt of the semantic patch performing
this transformation:

@@
type T2;
expression x;
identifier f,fld;
expression E;
expression E1,E2;
expression e1,e2,e3,y;
statement S;
@@

 x =
- kmalloc
+ kzalloc
  (E1,E2)
  ...  when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\)
- memset((T2)x,0,E1);

@@
expression E1,E2,E3;
@@

- kzalloc(E1 * E2,E3)
+ kcalloc(E1,E2,E3)

[akpm@linux-foundation.org: get kcalloc args the right way around]
Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <bryan.wu@analog.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Acked-by: Roland Dreier <rolandd@cisco.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Greg KH <greg@kroah.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 files changed, 8 insertions, 16 deletions

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 6c9dc2e69c82..a7a1c891bfa2 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -447,13 +447,12 @@ static int clcdfb_probe(struct amba_device *dev, void *id)
                 goto out;
         }
 
-        fb = kmalloc(sizeof(struct clcd_fb), GFP_KERNEL);
+        fb = kzalloc(sizeof(struct clcd_fb), GFP_KERNEL);
         if (!fb) {
                 printk(KERN_INFO "CLCD: could not allocate new clcd_fb struct\n");
                 ret = -ENOMEM;
                 goto free_region;
         }
-        memset(fb, 0, sizeof(struct clcd_fb));
 
         fb->dev = dev;
         fb->board = board;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index ef330e34d031..0c7bf75732ea 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2937,12 +2937,11 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 /* nothing */ ;
         j = i + 4;
 
-        par->mmap_map = kmalloc(j * sizeof(*par->mmap_map), GFP_ATOMIC);
+        par->mmap_map = kcalloc(j, sizeof(*par->mmap_map), GFP_ATOMIC);
         if (!par->mmap_map) {
                 PRINTKE("atyfb_setup_sparc() can't alloc mmap_map\n");
                 return -ENOMEM;
         }
-        memset(par->mmap_map, 0, j * sizeof(*par->mmap_map));
 
         for (i = 0, j = 2; i < 6 && pdev->resource[i].start; i++) {
                 struct resource *rp = &pdev->resource[i];
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index dbf4ec3f6d57..03e57ef88378 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1589,11 +1589,10 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
                 return -EFAULT;
         }
 
-        fbi->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
+        fbi->pseudo_palette = kcalloc(16, sizeof(u32), GFP_KERNEL);
         if (!fbi->pseudo_palette) {
                 return -ENOMEM;
         }
-        memset(fbi->pseudo_palette, 0, sizeof(u32) * 16);
 
         if (fb_alloc_cmap(&fbi->cmap, AU1200_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
                 print_err("Fail to allocate colormap (%d entries)",
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 50b78af0fa24..dea6579941b7 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -366,11 +366,10 @@ int __init clps711xfb_init(void)
         if (fb_get_options("clps711xfb", NULL))
                 return -ENODEV;
 
-        cfb = kmalloc(sizeof(*cfb), GFP_KERNEL);
+        cfb = kzalloc(sizeof(*cfb), GFP_KERNEL);
         if (!cfb)
                 goto out;
 
-        memset(cfb, 0, sizeof(*cfb));
         strcpy(cfb->fix.id, "clps711x");
 
         cfb->fbops              = &clps7111fb_ops;
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 7a6eeda5ae9a..30ede6e8830f 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1221,11 +1221,10 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
 {
         struct cfb_info *cfb;
 
-        cfb = kmalloc(sizeof(struct cfb_info), GFP_KERNEL);
+        cfb = kzalloc(sizeof(struct cfb_info), GFP_KERNEL);
         if (!cfb)
                 return NULL;
 
-        memset(cfb, 0, sizeof(struct cfb_info));
 
         cfb->id                 = id;
 
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 0f88c30f94f8..f9300266044d 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -1082,13 +1082,12 @@ static int __init pvr2fb_init(void)
 #endif
         size = sizeof(struct fb_info) + sizeof(struct pvr2fb_par) + 16 * sizeof(u32);
 
-        fb_info = kmalloc(size, GFP_KERNEL);
+        fb_info = kzalloc(size, GFP_KERNEL);
         if (!fb_info) {
                 printk(KERN_ERR "Failed to allocate memory for fb_info\n");
                 return -ENOMEM;
         }
 
-        memset(fb_info, 0, size);
 
         currentpar = (struct pvr2fb_par *)(fb_info + 1);
 
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 3d7507ad55f6..b855f4a34afe 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2174,11 +2174,10 @@ static int __devinit savage_init_fb_info(struct fb_info *info,
 
 #if defined(CONFIG_FB_SAVAGE_ACCEL)
         /* FIFO size + padding for commands */
-        info->pixmap.addr = kmalloc(8*1024, GFP_KERNEL);
+        info->pixmap.addr = kcalloc(8, 1024, GFP_KERNEL);
 
         err = -ENOMEM;
         if (info->pixmap.addr) {
-                memset(info->pixmap.addr, 0, 8*1024);
                 info->pixmap.size = 8*1024;
                 info->pixmap.scan_align = 4;
                 info->pixmap.buf_align = 4;
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index ad66f070acb8..7b0cef9ca8f9 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -356,10 +356,9 @@ int __init valkyriefb_init(void)
         }
 #endif /* ppc (!CONFIG_MAC) */
 
-        p = kmalloc(sizeof(*p), GFP_ATOMIC);
+        p = kzalloc(sizeof(*p), GFP_ATOMIC);
         if (p == 0)
                 return -ENOMEM;
-        memset(p, 0, sizeof(*p));
 
         /* Map in frame buffer and registers */
         if (!request_mem_region(frame_buffer_phys, 0x100000, "valkyriefb")) {