Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecce2a6f authored by Julia Lawall's avatar Julia Lawall Committed by David Woodhouse
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent aadff49c

drivers/mtd/nand/s3c2410.c

+2 −5
Original line number Diff line number Diff line
@@ -929,14 +929,13 @@ static int s3c24xx_nand_probe(struct platform_device *pdev) 


	pr_debug("s3c2410_nand_probe(%p)\n", pdev);



	info = kmalloc(sizeof(*info), GFP_KERNEL);

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (info == NULL) {

		dev_err(&pdev->dev, "no memory for flash info\n");

		err = -ENOMEM;

		goto exit_error;

	}



	memset(info, 0, sizeof(*info));

	platform_set_drvdata(pdev, info);



	spin_lock_init(&info->controller.lock);
@@ -994,15 +993,13 @@ static int s3c24xx_nand_probe(struct platform_device *pdev) 
	/* allocate our information */



	size = nr_sets * sizeof(*info->mtds);

	info->mtds = kmalloc(size, GFP_KERNEL);

	info->mtds = kzalloc(size, GFP_KERNEL);

	if (info->mtds == NULL) {

		dev_err(&pdev->dev, "failed to allocate mtd storage\n");

		err = -ENOMEM;

		goto exit_error;

	}



	memset(info->mtds, 0, size);



	/* initialise all possible chips */



	nmtd = info->mtds;