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

Commit 818b9739 authored by Huang Shijie's avatar Huang Shijie Committed by Brian Norris
Browse files

mtd: nand: add a helper to detect the nand type 



This helper detects that whether the mtd's type is nand type.

Now, it's clear that the MTD_NANDFLASH stands for SLC nand only.
So use the mtd_type_is_nand() to replace the old check method
to do the nand type (include the SLC and MLC) check.

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent fda5b0e2

drivers/mtd/inftlcore.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	struct INFTLrecord *inftl;

	unsigned long temp;



	if (mtd->type != MTD_NANDFLASH || mtd->size > UINT_MAX)

	if (!mtd_type_is_nand(mtd) || mtd->size > UINT_MAX)

		return;

	/* OK, this is moderately ugly.  But probably safe.  Alternatives? */

	if (memcmp(mtd->name, "DiskOnChip", 10))

drivers/mtd/nftlcore.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	struct NFTLrecord *nftl;

	unsigned long temp;



	if (mtd->type != MTD_NANDFLASH || mtd->size > UINT_MAX)

	if (!mtd_type_is_nand(mtd) || mtd->size > UINT_MAX)

		return;

	/* OK, this is moderately ugly.  But probably safe.  Alternatives? */

	if (memcmp(mtd->name, "DiskOnChip", 10))

drivers/mtd/ssfdc.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void ssfdcr_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	int cis_sector;



	/* Check for small page NAND flash */

	if (mtd->type != MTD_NANDFLASH || mtd->oobsize != OOB_SIZE ||

	if (!mtd_type_is_nand(mtd) || mtd->oobsize != OOB_SIZE ||

	    mtd->size > UINT_MAX)

		return;

drivers/mtd/tests/nandbiterrs.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int __init mtd_nandbiterrs_init(void) 
		goto exit_mtddev;

	}



	if (mtd->type != MTD_NANDFLASH) {

	if (!mtd_type_is_nand(mtd)) {

		pr_info("this test requires NAND flash\n");

		err = -ENODEV;

		goto exit_nand;

drivers/mtd/tests/oobtest.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int __init mtd_oobtest_init(void) 
		return err;

	}



	if (mtd->type != MTD_NANDFLASH) {

	if (!mtd_type_is_nand(mtd)) {

		pr_info("this test requires NAND flash\n");

		goto out;

	}