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

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

drivers/mtd: 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 ecce2a6f

drivers/mtd/lpddr/qinfo_probe.c

+2 −5
Original line number Diff line number Diff line
@@ -134,13 +134,12 @@ out: 
static int lpddr_chip_setup(struct map_info *map, struct lpddr_private *lpddr)

{



	lpddr->qinfo = kmalloc(sizeof(struct qinfo_chip), GFP_KERNEL);

	lpddr->qinfo = kzalloc(sizeof(struct qinfo_chip), GFP_KERNEL);

	if (!lpddr->qinfo) {

		printk(KERN_WARNING "%s: no memory for LPDDR qinfo structure\n",

				map->name);

		return 0;

	}

	memset(lpddr->qinfo, 0, sizeof(struct qinfo_chip));



	/* Get the ManuID */

	lpddr->ManufactId = CMDVAL(map_read(map, map->pfow_base + PFOW_MANUFACTURER_ID));
@@ -185,13 +184,11 @@ static struct lpddr_private *lpddr_probe_chip(struct map_info *map) 
	lpddr.numchips = 1;



	numvirtchips = lpddr.numchips * lpddr.qinfo->HWPartsNum;

	retlpddr = kmalloc(sizeof(struct lpddr_private) +

	retlpddr = kzalloc(sizeof(struct lpddr_private) +

			numvirtchips * sizeof(struct flchip), GFP_KERNEL);

	if (!retlpddr)

		return NULL;



	memset(retlpddr, 0, sizeof(struct lpddr_private) +

				numvirtchips * sizeof(struct flchip));

	memcpy(retlpddr, &lpddr, sizeof(struct lpddr_private));



	retlpddr->numchips = numvirtchips;

drivers/mtd/maps/ixp2000.c

+1 −2
Original line number Diff line number Diff line
@@ -165,12 +165,11 @@ static int ixp2000_flash_probe(struct platform_device *dev) 
		return -EIO;

	}



	info = kmalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);

	info = kzalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL);

	if(!info) {

		err = -ENOMEM;

		goto Error;

	}

	memset(info, 0, sizeof(struct ixp2000_flash_info));



	platform_set_drvdata(dev, info);

drivers/mtd/maps/ixp4xx.c

+1 −2
Original line number Diff line number Diff line
@@ -196,12 +196,11 @@ static int ixp4xx_flash_probe(struct platform_device *dev) 
			return err;

	}



	info = kmalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);

	info = kzalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL);

	if(!info) {

		err = -ENOMEM;

		goto Error;

	}

	memset(info, 0, sizeof(struct ixp4xx_flash_info));



	platform_set_drvdata(dev, info);

drivers/mtd/maps/pxa2xx-flash.c

+1 −2
Original line number Diff line number Diff line
@@ -63,11 +63,10 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev) 
	if (!res)

		return -ENODEV;



	info = kmalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);

	info = kzalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	memset(info, 0, sizeof(struct pxa2xx_flash_info));

	info->map.name = (char *) flash->name;

	info->map.bankwidth = flash->width;

	info->map.phys = res->start;

drivers/mtd/tests/mtd_pagetest.c

+1 −2
Original line number Diff line number Diff line
@@ -480,12 +480,11 @@ static int scan_for_bad_eraseblocks(void) 
{

	int i, bad = 0;



	bbt = kmalloc(ebcnt, GFP_KERNEL);

	bbt = kzalloc(ebcnt, GFP_KERNEL);

	if (!bbt) {

		printk(PRINT_PREF "error: cannot allocate memory\n");

		return -ENOMEM;

	}

	memset(bbt, 0 , ebcnt);



	printk(PRINT_PREF "scanning for bad eraseblocks\n");

	for (i = 0; i < ebcnt; ++i) {