Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ecce2a6f9bdc7635838baeff8a09a76c9a70e7e0

Authored by Julia Lawall
Committed by David Woodhouse
1 parent aadff49c56
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drivers/mtd/nand: 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: David Woodhouse <David.Woodhouse@intel.com>

Showing 1 changed file with 2 additions and 5 deletions Side-by-side Diff

drivers/mtd/nand/s3c2410.c
Diff comments   View file @ ecce2a6
... ... @@ -929,14 +929,13 @@
929 929  
930 930 pr_debug("s3c2410_nand_probe(%p)\n", pdev);
931 931  
932   - info = kmalloc(sizeof(*info), GFP_KERNEL);
  932 + info = kzalloc(sizeof(*info), GFP_KERNEL);
933 933 if (info == NULL) {
934 934 dev_err(&pdev->dev, "no memory for flash info\n");
935 935 err = -ENOMEM;
936 936 goto exit_error;
937 937 }
938 938  
939   - memset(info, 0, sizeof(*info));
940 939 platform_set_drvdata(pdev, info);
941 940  
942 941 spin_lock_init(&info->controller.lock);
943 942  
... ... @@ -994,14 +993,12 @@
994 993 /* allocate our information */
995 994  
996 995 size = nr_sets * sizeof(*info->mtds);
997   - info->mtds = kmalloc(size, GFP_KERNEL);
  996 + info->mtds = kzalloc(size, GFP_KERNEL);
998 997 if (info->mtds == NULL) {
999 998 dev_err(&pdev->dev, "failed to allocate mtd storage\n");
1000 999 err = -ENOMEM;
1001 1000 goto exit_error;
1002 1001 }
1003   -
1004   - memset(info->mtds, 0, size);
1005 1002  
1006 1003 /* initialise all possible chips */
1007 1004