]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mtd: mtdswap: remove useless if (!mtd->ecclayout) test
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Mon, 7 Mar 2016 09:46:53 +0000 (10:46 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 8 Mar 2016 00:23:09 +0000 (16:23 -0800)
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: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/mtdswap.c

index d330eb1d3eba74ab865b58f9e61d8e1f5a7af79c..cb06bdd21a1b57ef73e0d6e3034870bd95d51962 100644 (file)
@@ -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",