1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 891c52a30e6a..cb38f3d94218 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -218,7 +218,6 @@ MODULE_PARM_DESC(bch,		 "Enable BCH ecc and set how many bits should "
 #define STATE_CMD_READOOB      0x00000005 /* read OOB area */
 #define STATE_CMD_ERASE1       0x00000006 /* sector erase first command */
 #define STATE_CMD_STATUS       0x00000007 /* read status */
-#define STATE_CMD_STATUS_M     0x00000008 /* read multi-plane status (isn't implemented) */
 #define STATE_CMD_SEQIN        0x00000009 /* sequential data input */
 #define STATE_CMD_READID       0x0000000A /* read ID */
 #define STATE_CMD_ERASE2       0x0000000B /* sector erase second command */
@@ -263,14 +262,13 @@ MODULE_PARM_DESC(bch,		 "Enable BCH ecc and set how many bits should "
 #define NS_OPER_STATES   6  /* Maximum number of states in operation */
 
 #define OPT_ANY          0xFFFFFFFF /* any chip supports this operation */
-#define OPT_PAGE256      0x00000001 /* 256-byte  page chips */
 #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 */
-#define OPT_SMALLPAGE    (OPT_PAGE256  | OPT_PAGE512)  /* 256 and 512-byte page chips */
+#define OPT_SMALLPAGE    (OPT_PAGE512) /* 512-byte page chips */
 
 /* Remove action bits from state */
 #define NS_STATE(x) ((x) & ~ACTION_MASK)
@@ -406,8 +404,6 @@ static struct nandsim_operations {
         {OPT_ANY, {STATE_CMD_ERASE1, STATE_ADDR_SEC, STATE_CMD_ERASE2 | ACTION_SECERASE, STATE_READY}},
         /* Read status */
         {OPT_ANY, {STATE_CMD_STATUS, STATE_DATAOUT_STATUS, STATE_READY}},
-        /* Read multi-plane status */
-        {OPT_SMARTMEDIA, {STATE_CMD_STATUS_M, STATE_DATAOUT_STATUS_M, STATE_READY}},
         /* Read ID */
         {OPT_ANY, {STATE_CMD_READID, STATE_ADDR_ZERO, STATE_DATAOUT_ID, STATE_READY}},
         /* Large page devices read page */
@@ -699,10 +695,7 @@ static int init_nandsim(struct mtd_info *mtd)
         ns->geom.secszoob = ns->geom.secsz + ns->geom.oobsz * ns->geom.pgsec;
         ns->options = 0;
 
-        if (ns->geom.pgsz == 256) {
-                ns->options |= OPT_PAGE256;
-        }
-        else if (ns->geom.pgsz == 512) {
+        if (ns->geom.pgsz == 512) {
                 ns->options |= OPT_PAGE512;
                 if (ns->busw == 8)
                         ns->options |= OPT_PAGE512_8BIT;
@@ -769,9 +762,9 @@ static int init_nandsim(struct mtd_info *mtd)
         }
 
         /* Detect how many ID bytes the NAND chip outputs */
-        for (i = 0; nand_flash_ids[i].name != NULL; i++) {
-                if (second_id_byte != nand_flash_ids[i].id)
-                        continue;
+        for (i = 0; nand_flash_ids[i].name != NULL; i++) {
+                if (second_id_byte != nand_flash_ids[i].dev_id)
+                        continue;
         }
 
         if (ns->busw == 16)
@@ -1079,8 +1072,6 @@ static char *get_state_name(uint32_t state)
                         return "STATE_CMD_ERASE1";
                 case STATE_CMD_STATUS:
                         return "STATE_CMD_STATUS";
-                case STATE_CMD_STATUS_M:
-                        return "STATE_CMD_STATUS_M";
                 case STATE_CMD_SEQIN:
                         return "STATE_CMD_SEQIN";
                 case STATE_CMD_READID:
@@ -1145,7 +1136,6 @@ static int check_command(int cmd)
         case NAND_CMD_RNDOUTSTART:
                 return 0;
 
-        case NAND_CMD_STATUS_MULTI:
         default:
                 return 1;
         }
@@ -1171,8 +1161,6 @@ static uint32_t get_state_by_command(unsigned command)
                         return STATE_CMD_ERASE1;
                 case NAND_CMD_STATUS:
                         return STATE_CMD_STATUS;
-                case NAND_CMD_STATUS_MULTI:
-                        return STATE_CMD_STATUS_M;
                 case NAND_CMD_SEQIN:
                         return STATE_CMD_SEQIN;
                 case NAND_CMD_READID:
@@ -2306,7 +2294,7 @@ static int __init ns_init_module(void)
                 nand->geom.idbytes = 2;
         nand->regs.status = NS_STATUS_OK(nand);
         nand->nxstate = STATE_UNKNOWN;
-        nand->options |= OPT_PAGE256; /* temporary value */
+        nand->options |= OPT_PAGE512; /* temporary value */
         nand->ids[0] = first_id_byte;
         nand->ids[1] = second_id_byte;
         nand->ids[2] = third_id_byte;