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

Commit e4eec195 authored by Jingoo Han's avatar Jingoo Han Committed by Brian Norris
Browse files

mtd: onenand: Remove unnecessary OOM messages 



The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 54f5a57e

drivers/mtd/onenand/onenand_base.c

+1 −6
Original line number Diff line number Diff line
@@ -3994,11 +3994,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) 
	/* Allocate buffers, if necessary */

	if (!this->page_buf) {

		this->page_buf = kzalloc(mtd->writesize, GFP_KERNEL);

		if (!this->page_buf) {

			printk(KERN_ERR "%s: Can't allocate page_buf\n",

				__func__);

		if (!this->page_buf)

			return -ENOMEM;

		}

#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE

		this->verify_buf = kzalloc(mtd->writesize, GFP_KERNEL);

		if (!this->verify_buf) {
@@ -4011,8 +4008,6 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) 
	if (!this->oob_buf) {

		this->oob_buf = kzalloc(mtd->oobsize, GFP_KERNEL);

		if (!this->oob_buf) {

			printk(KERN_ERR "%s: Can't allocate oob_buf\n",

				__func__);

			if (this->options & ONENAND_PAGEBUF_ALLOC) {

				this->options &= ~ONENAND_PAGEBUF_ALLOC;

				kfree(this->page_buf);

drivers/mtd/onenand/samsung.c

+1 −3
Original line number Diff line number Diff line
@@ -872,10 +872,8 @@ static int s3c_onenand_probe(struct platform_device *pdev) 


	size = sizeof(struct mtd_info) + sizeof(struct onenand_chip);

	mtd = kzalloc(size, GFP_KERNEL);

	if (!mtd) {

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

	if (!mtd)

		return -ENOMEM;

	}



	onenand = kzalloc(sizeof(struct s3c_onenand), GFP_KERNEL);

	if (!onenand) {