diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-03-04 07:35:56 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 07:01:33 -0400 |
commit | 0be718e5525a73557e76ea1c05b8001dde507049 (patch) | |
tree | 32772fb45dcc22fde0becd56e6d94af63b668e65 /drivers/mtd/nand | |
parent | 14c6578683367b1e7af0c3c09e872b45a45183a7 (diff) |
mtd: nand: remove a bunch of unused commands
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 6 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 10 | ||||
-rw-r--r-- | drivers/mtd/nand/nandsim.c | 8 | ||||
-rw-r--r-- | drivers/mtd/nand/nuc900_nand.c | 9 |
4 files changed, 0 insertions, 33 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 010d61266536..a01ccb970102 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
@@ -303,13 +303,7 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command, | |||
303 | case NAND_CMD_SEQIN: | 303 | case NAND_CMD_SEQIN: |
304 | case NAND_CMD_RNDIN: | 304 | case NAND_CMD_RNDIN: |
305 | case NAND_CMD_STATUS: | 305 | case NAND_CMD_STATUS: |
306 | case NAND_CMD_DEPLETE1: | ||
307 | case NAND_CMD_RNDOUT: | 306 | case NAND_CMD_RNDOUT: |
308 | case NAND_CMD_STATUS_ERROR: | ||
309 | case NAND_CMD_STATUS_ERROR0: | ||
310 | case NAND_CMD_STATUS_ERROR1: | ||
311 | case NAND_CMD_STATUS_ERROR2: | ||
312 | case NAND_CMD_STATUS_ERROR3: | ||
313 | cafe_writel(cafe, cafe->ctl2, NAND_CTRL2); | 307 | cafe_writel(cafe, cafe->ctl2, NAND_CTRL2); |
314 | return; | 308 | return; |
315 | } | 309 | } |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 7b7ebd5ed430..39154aa50fcc 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -668,16 +668,6 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command, | |||
668 | case NAND_CMD_SEQIN: | 668 | case NAND_CMD_SEQIN: |
669 | case NAND_CMD_RNDIN: | 669 | case NAND_CMD_RNDIN: |
670 | case NAND_CMD_STATUS: | 670 | case NAND_CMD_STATUS: |
671 | case NAND_CMD_DEPLETE1: | ||
672 | return; | ||
673 | |||
674 | case NAND_CMD_STATUS_ERROR: | ||
675 | case NAND_CMD_STATUS_ERROR0: | ||
676 | case NAND_CMD_STATUS_ERROR1: | ||
677 | case NAND_CMD_STATUS_ERROR2: | ||
678 | case NAND_CMD_STATUS_ERROR3: | ||
679 | /* Read error status commands require only a short delay */ | ||
680 | udelay(chip->chip_delay); | ||
681 | return; | 671 | return; |
682 | 672 | ||
683 | case NAND_CMD_RESET: | 673 | case NAND_CMD_RESET: |
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 891c52a30e6a..7199acc7e7f4 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 " | |||
218 | #define STATE_CMD_READOOB 0x00000005 /* read OOB area */ | 218 | #define STATE_CMD_READOOB 0x00000005 /* read OOB area */ |
219 | #define STATE_CMD_ERASE1 0x00000006 /* sector erase first command */ | 219 | #define STATE_CMD_ERASE1 0x00000006 /* sector erase first command */ |
220 | #define STATE_CMD_STATUS 0x00000007 /* read status */ | 220 | #define STATE_CMD_STATUS 0x00000007 /* read status */ |
221 | #define STATE_CMD_STATUS_M 0x00000008 /* read multi-plane status (isn't implemented) */ | ||
222 | #define STATE_CMD_SEQIN 0x00000009 /* sequential data input */ | 221 | #define STATE_CMD_SEQIN 0x00000009 /* sequential data input */ |
223 | #define STATE_CMD_READID 0x0000000A /* read ID */ | 222 | #define STATE_CMD_READID 0x0000000A /* read ID */ |
224 | #define STATE_CMD_ERASE2 0x0000000B /* sector erase second command */ | 223 | #define STATE_CMD_ERASE2 0x0000000B /* sector erase second command */ |
@@ -406,8 +405,6 @@ static struct nandsim_operations { | |||
406 | {OPT_ANY, {STATE_CMD_ERASE1, STATE_ADDR_SEC, STATE_CMD_ERASE2 | ACTION_SECERASE, STATE_READY}}, | 405 | {OPT_ANY, {STATE_CMD_ERASE1, STATE_ADDR_SEC, STATE_CMD_ERASE2 | ACTION_SECERASE, STATE_READY}}, |
407 | /* Read status */ | 406 | /* Read status */ |
408 | {OPT_ANY, {STATE_CMD_STATUS, STATE_DATAOUT_STATUS, STATE_READY}}, | 407 | {OPT_ANY, {STATE_CMD_STATUS, STATE_DATAOUT_STATUS, STATE_READY}}, |
409 | /* Read multi-plane status */ | ||
410 | {OPT_SMARTMEDIA, {STATE_CMD_STATUS_M, STATE_DATAOUT_STATUS_M, STATE_READY}}, | ||
411 | /* Read ID */ | 408 | /* Read ID */ |
412 | {OPT_ANY, {STATE_CMD_READID, STATE_ADDR_ZERO, STATE_DATAOUT_ID, STATE_READY}}, | 409 | {OPT_ANY, {STATE_CMD_READID, STATE_ADDR_ZERO, STATE_DATAOUT_ID, STATE_READY}}, |
413 | /* Large page devices read page */ | 410 | /* Large page devices read page */ |
@@ -1079,8 +1076,6 @@ static char *get_state_name(uint32_t state) | |||
1079 | return "STATE_CMD_ERASE1"; | 1076 | return "STATE_CMD_ERASE1"; |
1080 | case STATE_CMD_STATUS: | 1077 | case STATE_CMD_STATUS: |
1081 | return "STATE_CMD_STATUS"; | 1078 | return "STATE_CMD_STATUS"; |
1082 | case STATE_CMD_STATUS_M: | ||
1083 | return "STATE_CMD_STATUS_M"; | ||
1084 | case STATE_CMD_SEQIN: | 1079 | case STATE_CMD_SEQIN: |
1085 | return "STATE_CMD_SEQIN"; | 1080 | return "STATE_CMD_SEQIN"; |
1086 | case STATE_CMD_READID: | 1081 | case STATE_CMD_READID: |
@@ -1145,7 +1140,6 @@ static int check_command(int cmd) | |||
1145 | case NAND_CMD_RNDOUTSTART: | 1140 | case NAND_CMD_RNDOUTSTART: |
1146 | return 0; | 1141 | return 0; |
1147 | 1142 | ||
1148 | case NAND_CMD_STATUS_MULTI: | ||
1149 | default: | 1143 | default: |
1150 | return 1; | 1144 | return 1; |
1151 | } | 1145 | } |
@@ -1171,8 +1165,6 @@ static uint32_t get_state_by_command(unsigned command) | |||
1171 | return STATE_CMD_ERASE1; | 1165 | return STATE_CMD_ERASE1; |
1172 | case NAND_CMD_STATUS: | 1166 | case NAND_CMD_STATUS: |
1173 | return STATE_CMD_STATUS; | 1167 | return STATE_CMD_STATUS; |
1174 | case NAND_CMD_STATUS_MULTI: | ||
1175 | return STATE_CMD_STATUS_M; | ||
1176 | case NAND_CMD_SEQIN: | 1168 | case NAND_CMD_SEQIN: |
1177 | return STATE_CMD_SEQIN; | 1169 | return STATE_CMD_SEQIN; |
1178 | case NAND_CMD_READID: | 1170 | case NAND_CMD_READID: |
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c index a6191198d259..cd6be2ed53a8 100644 --- a/drivers/mtd/nand/nuc900_nand.c +++ b/drivers/mtd/nand/nuc900_nand.c | |||
@@ -177,15 +177,6 @@ static void nuc900_nand_command_lp(struct mtd_info *mtd, unsigned int command, | |||
177 | case NAND_CMD_SEQIN: | 177 | case NAND_CMD_SEQIN: |
178 | case NAND_CMD_RNDIN: | 178 | case NAND_CMD_RNDIN: |
179 | case NAND_CMD_STATUS: | 179 | case NAND_CMD_STATUS: |
180 | case NAND_CMD_DEPLETE1: | ||
181 | return; | ||
182 | |||
183 | case NAND_CMD_STATUS_ERROR: | ||
184 | case NAND_CMD_STATUS_ERROR0: | ||
185 | case NAND_CMD_STATUS_ERROR1: | ||
186 | case NAND_CMD_STATUS_ERROR2: | ||
187 | case NAND_CMD_STATUS_ERROR3: | ||
188 | udelay(chip->chip_delay); | ||
189 | return; | 180 | return; |
190 | 181 | ||
191 | case NAND_CMD_RESET: | 182 | case NAND_CMD_RESET: |