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

Commit f2de0fa6 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: mtdswap: remove useless if (!mtd->ecclayout) test 



If the MTD device does not have OOB, the mtd->oobsize and mtd->oobavail
fields are set to zero, and we are testing those values in the following
test.
Remove the useless if (!mtd->ecclayout) test.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 29f1058a

drivers/mtd/mtdswap.c

+0 −8
Original line number Diff line number Diff line
@@ -1417,7 +1417,6 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	unsigned long part;

	unsigned int eblocks, eavailable, bad_blocks, spare_cnt;

	uint64_t swap_size, use_size, size_limit;

	struct nand_ecclayout *oinfo;

	int ret;



	parts = &partitions[0];
@@ -1447,13 +1446,6 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
		return;

	}



	oinfo = mtd->ecclayout;

	if (!oinfo) {

		printk(KERN_ERR "%s: mtd%d does not have OOB\n",

			MTDSWAP_PREFIX, mtd->index);

		return;

	}



	if (!mtd->oobsize || mtd->oobavail < MTDSWAP_OOBSIZE) {

		printk(KERN_ERR "%s: Not enough free bytes in OOB, "

			"%d available, %zu needed.\n",