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>

5 files changed, 5 insertions, 11 deletions

diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 5a1449f485cf..28929b618e20 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -905,12 +905,11 @@ static int cinergyt2_probe (struct usb_interface *intf,
         struct cinergyt2 *cinergyt2;
         int err;
 
-        if (!(cinergyt2 = kmalloc (sizeof(struct cinergyt2), GFP_KERNEL))) {
+        if (!(cinergyt2 = kzalloc (sizeof(struct cinergyt2), GFP_KERNEL))) {
                 dprintk(1, "out of memory?!?\n");
                 return -ENOMEM;
         }
 
-        memset (cinergyt2, 0, sizeof (struct cinergyt2));
         usb_set_intfdata (intf, (void *) cinergyt2);
 
         mutex_init(&cinergyt2->sem);
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index 55aab8d38880..a76bd786cf13 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -2224,15 +2224,13 @@ struct camera_data *cpia2_init_camera_struct(void)
 {
         struct camera_data *cam;
 
-        cam = kmalloc(sizeof(*cam), GFP_KERNEL);
+        cam = kzalloc(sizeof(*cam), GFP_KERNEL);
 
         if (!cam) {
                 ERR("couldn't kmalloc cpia2 struct\n");
                 return NULL;
         }
 
-        /* Default everything to 0 */
-        memset(cam, 0, sizeof(struct camera_data));
 
         cam->present = 1;
         mutex_init(&cam->busy_lock);
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 507b1d4260ed..11cfcf18ec34 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -812,10 +812,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
         int msp_product, msp_prod_hi, msp_prod_lo;
         int msp_rom;
 
-        client = kmalloc(sizeof(*client), GFP_KERNEL);
+        client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (client == NULL)
                 return -ENOMEM;
-        memset(client, 0, sizeof(*client));
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver;
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 1455a8f4e930..4ab1af74a970 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -353,9 +353,8 @@ static int planb_prepare_open(struct planb *pb)
                 * PLANB_DUMMY)*sizeof(struct dbdma_cmd)
                 +(PLANB_MAXLINES*((PLANB_MAXPIXELS+7)& ~7))/8
                 +MAX_GBUFFERS*sizeof(unsigned int);
-        if ((pb->priv_space = kmalloc (size, GFP_KERNEL)) == 0)
+        if ((pb->priv_space = kzalloc (size, GFP_KERNEL)) == 0)
                 return -ENOMEM;
-        memset ((void *) pb->priv_space, 0, size);
         pb->overlay_last1 = pb->ch1_cmd = (volatile struct dbdma_cmd *)
                                                 DBDMA_ALIGN (pb->priv_space);
         pb->overlay_last2 = pb->ch2_cmd = pb->ch1_cmd + pb->tab_size;
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 2d9c0dd3b733..ff555129c82f 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -1130,13 +1130,12 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
         }
 
         if ((cam =
-             kmalloc(sizeof (struct vicam_camera), GFP_KERNEL)) == NULL) {
+             kzalloc(sizeof (struct vicam_camera), GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING
                        "could not allocate kernel memory for vicam_camera struct\n");
                 return -ENOMEM;
         }
 
-        memset(cam, 0, sizeof (struct vicam_camera));
 
         cam->shutter_speed = 15;