1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index ab5bbf567439..f2324271b94e 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -245,7 +245,6 @@ MODULE_PARM_DESC(bch,		 "Enable BCH ecc and set how many bits should "
 #define STATE_DATAOUT          0x00001000 /* waiting for page data output */
 #define STATE_DATAOUT_ID       0x00002000 /* waiting for ID bytes output */
 #define STATE_DATAOUT_STATUS   0x00003000 /* waiting for status output */
-#define STATE_DATAOUT_STATUS_M 0x00004000 /* waiting for multi-plane status output */
 #define STATE_DATAOUT_MASK     0x00007000 /* data output states mask */
 
 /* Previous operation is done, ready to accept new requests */
@@ -269,7 +268,6 @@ MODULE_PARM_DESC(bch,		 "Enable BCH ecc and set how many bits should "
 #define OPT_ANY          0xFFFFFFFF /* any chip supports this operation */
 #define OPT_PAGE512      0x00000002 /* 512-byte  page chips */
 #define OPT_PAGE2048     0x00000008 /* 2048-byte page chips */
-#define OPT_SMARTMEDIA   0x00000010 /* SmartMedia technology chips */
 #define OPT_PAGE512_8BIT 0x00000040 /* 512-byte page chips with 8-bit bus width */
 #define OPT_PAGE4096     0x00000080 /* 4096-byte page chips */
 #define OPT_LARGEPAGE    (OPT_PAGE2048 | OPT_PAGE4096) /* 2048 & 4096-byte page chips */
@@ -1096,8 +1094,6 @@ static char *get_state_name(uint32_t state)
                         return "STATE_DATAOUT_ID";
                 case STATE_DATAOUT_STATUS:
                         return "STATE_DATAOUT_STATUS";
-                case STATE_DATAOUT_STATUS_M:
-                        return "STATE_DATAOUT_STATUS_M";
                 case STATE_READY:
                         return "STATE_READY";
                 case STATE_UNKNOWN:
@@ -1865,7 +1861,6 @@ static void switch_state(struct nandsim *ns)
                                 break;
 
                         case STATE_DATAOUT_STATUS:
-                        case STATE_DATAOUT_STATUS_M:
                                 ns->regs.count = ns->regs.num = 0;
                                 break;
 
@@ -2005,7 +2000,6 @@ static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
                 }
 
                 if (NS_STATE(ns->state) == STATE_DATAOUT_STATUS
-                        || NS_STATE(ns->state) == STATE_DATAOUT_STATUS_M
                         || NS_STATE(ns->state) == STATE_DATAOUT) {
                         int row = ns->regs.row;
 
@@ -2343,6 +2337,7 @@ static int __init ns_init_module(void)
                 }
                 chip->ecc.mode = NAND_ECC_SOFT_BCH;
                 chip->ecc.size = 512;
+                chip->ecc.strength = bch;
                 chip->ecc.bytes = eccbytes;
                 NS_INFO("using %u-bit/%u bytes BCH ECC\n", bch, chip->ecc.size);
         }