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

Commit 7e3019e3 authored by Sachin Kamat's avatar Sachin Kamat Committed by Brian Norris
Browse files

mtd: bcm47xxnflash: Use devm_kzalloc 



devm_kzalloc is device managed and simplifies the code.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 994bbd0e

drivers/mtd/nand/bcm47xxnflash/main.c

+5 −13
Original line number Diff line number Diff line
@@ -29,11 +29,9 @@ static int bcm47xxnflash_probe(struct platform_device *pdev) 
	struct bcm47xxnflash *b47n;

	int err = 0;



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

	if (!b47n) {

		err = -ENOMEM;

		goto out;

	}

	b47n = devm_kzalloc(&pdev->dev, sizeof(*b47n), GFP_KERNEL);

	if (!b47n)

		return -ENOMEM;



	b47n->nand_chip.priv = b47n;

	b47n->mtd.owner = THIS_MODULE;
@@ -48,22 +46,16 @@ static int bcm47xxnflash_probe(struct platform_device *pdev) 
	}

	if (err) {

		pr_err("Initialization failed: %d\n", err);

		goto err_init;

		return err;

	}



	err = mtd_device_parse_register(&b47n->mtd, probes, NULL, NULL, 0);

	if (err) {

		pr_err("Failed to register MTD device: %d\n", err);

		goto err_dev_reg;

		return err;

	}



	return 0;



err_dev_reg:

err_init:

	kfree(b47n);

out:

	return err;

}



static int bcm47xxnflash_remove(struct platform_device *pdev)