aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-13 15:59:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 00:23:16 -0400
commit2ef17c9fc8241e5b08c60ca82345c540bb001876 (patch)
treeeb34d0c269b90712be1cd6c6c05ad8b09735015e
parent59fd08afe0f9ae3a3b793fc178a3c3677b1e716c (diff)
V4L/DVB: drivers/media: Use kzalloc
Use 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,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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/frontends/ds3000.c5
-rw-r--r--drivers/media/video/omap/omap_vout.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
index 78001e8bcdb7..fc61d9230db8 100644
--- a/drivers/media/dvb/frontends/ds3000.c
+++ b/drivers/media/dvb/frontends/ds3000.c
@@ -969,15 +969,12 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
969 dprintk("%s\n", __func__); 969 dprintk("%s\n", __func__);
970 970
971 /* allocate memory for the internal state */ 971 /* allocate memory for the internal state */
972 state = kmalloc(sizeof(struct ds3000_state), GFP_KERNEL); 972 state = kzalloc(sizeof(struct ds3000_state), GFP_KERNEL);
973 if (state == NULL) { 973 if (state == NULL) {
974 printk(KERN_ERR "Unable to kmalloc\n"); 974 printk(KERN_ERR "Unable to kmalloc\n");
975 goto error2; 975 goto error2;
976 } 976 }
977 977
978 /* setup the state */
979 memset(state, 0, sizeof(struct ds3000_state));
980
981 state->config = config; 978 state->config = config;
982 state->i2c = i2c; 979 state->i2c = i2c;
983 state->prevUCBS2 = 0; 980 state->prevUCBS2 = 0;
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 4c0ab499228b..e7db0554949a 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -2371,12 +2371,11 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev)
2371 2371
2372 for (k = 0; k < pdev->num_resources; k++) { 2372 for (k = 0; k < pdev->num_resources; k++) {
2373 2373
2374 vout = kmalloc(sizeof(struct omap_vout_device), GFP_KERNEL); 2374 vout = kzalloc(sizeof(struct omap_vout_device), GFP_KERNEL);
2375 if (!vout) { 2375 if (!vout) {
2376 dev_err(&pdev->dev, ": could not allocate memory\n"); 2376 dev_err(&pdev->dev, ": could not allocate memory\n");
2377 return -ENOMEM; 2377 return -ENOMEM;
2378 } 2378 }
2379 memset(vout, 0, sizeof(struct omap_vout_device));
2380 2379
2381 vout->vid = k; 2380 vout->vid = k;
2382 vid_dev->vouts[k] = vout; 2381 vid_dev->vouts[k] = vout;