8 files changed, 12 insertions, 7 deletions

diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 3af351484098..b66b541877f0 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -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))
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index c5f4ebf4b384..46f27de018c3 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -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))
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index ab2a52a039c3..daf82ba7aba0 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -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;
 
diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
index 207bf9a9972f..3d8242f592d9 100644
--- a/drivers/mtd/tests/nandbiterrs.c
+++ b/drivers/mtd/tests/nandbiterrs.c
@@ -382,7 +382,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;
diff --git a/drivers/mtd/tests/oobtest.c b/drivers/mtd/tests/oobtest.c
index ab81e9a5947e..6c5c3ac0a8f5 100644
--- a/drivers/mtd/tests/oobtest.c
+++ b/drivers/mtd/tests/oobtest.c
@@ -360,7 +360,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;
         }
diff --git a/drivers/mtd/tests/pagetest.c b/drivers/mtd/tests/pagetest.c
index acd991f4bf94..80ecd64c8f58 100644
--- a/drivers/mtd/tests/pagetest.c
+++ b/drivers/mtd/tests/pagetest.c
@@ -492,7 +492,7 @@ static int __init mtd_pagetest_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;
         }
diff --git a/drivers/mtd/tests/subpagetest.c b/drivers/mtd/tests/subpagetest.c
index e41a04f5caab..c6e2d71d1ddd 100644
--- a/drivers/mtd/tests/subpagetest.c
+++ b/drivers/mtd/tests/subpagetest.c
@@ -371,7 +371,7 @@ static int __init mtd_subpagetest_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;
         }
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index f9bfe526d310..88409b813418 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -354,6 +354,11 @@ static inline int mtd_has_oob(const struct mtd_info *mtd)
         return mtd->_read_oob && mtd->_write_oob;
 }
 
+static inline int mtd_type_is_nand(const struct mtd_info *mtd)
+{
+        return mtd->type == MTD_NANDFLASH || mtd->type == MTD_MLCNANDFLASH;
+}
+
 static inline int mtd_can_have_bb(const struct mtd_info *mtd)
 {
         return !!mtd->_block_isbad;