Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nandsim: remove unused STATE_DATAOUT_STATUS_M and OPT_SMARTMEDIA

There is no path to switch to STATE_DATAOUT_STATUS_M state, and
OPT_SMARTMEDIA is unused.

This is leftover from commit 0be718e5525a73557e76ea1c05b8001dde507049
("mtd: nand: remove a bunch of unused commands").

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

authored by

Akinobu Mita and committed by
Brian Norris
69a559e7 526789fc

-6
-6
drivers/mtd/nand/nandsim.c
··· 245 245 #define STATE_DATAOUT 0x00001000 /* waiting for page data output */ 246 246 #define STATE_DATAOUT_ID 0x00002000 /* waiting for ID bytes output */ 247 247 #define STATE_DATAOUT_STATUS 0x00003000 /* waiting for status output */ 248 - #define STATE_DATAOUT_STATUS_M 0x00004000 /* waiting for multi-plane status output */ 249 248 #define STATE_DATAOUT_MASK 0x00007000 /* data output states mask */ 250 249 251 250 /* Previous operation is done, ready to accept new requests */ ··· 268 269 #define OPT_ANY 0xFFFFFFFF /* any chip supports this operation */ 269 270 #define OPT_PAGE512 0x00000002 /* 512-byte page chips */ 270 271 #define OPT_PAGE2048 0x00000008 /* 2048-byte page chips */ 271 - #define OPT_SMARTMEDIA 0x00000010 /* SmartMedia technology chips */ 272 272 #define OPT_PAGE512_8BIT 0x00000040 /* 512-byte page chips with 8-bit bus width */ 273 273 #define OPT_PAGE4096 0x00000080 /* 4096-byte page chips */ 274 274 #define OPT_LARGEPAGE (OPT_PAGE2048 | OPT_PAGE4096) /* 2048 & 4096-byte page chips */ ··· 1094 1096 return "STATE_DATAOUT_ID"; 1095 1097 case STATE_DATAOUT_STATUS: 1096 1098 return "STATE_DATAOUT_STATUS"; 1097 - case STATE_DATAOUT_STATUS_M: 1098 - return "STATE_DATAOUT_STATUS_M"; 1099 1099 case STATE_READY: 1100 1100 return "STATE_READY"; 1101 1101 case STATE_UNKNOWN: ··· 1861 1865 break; 1862 1866 1863 1867 case STATE_DATAOUT_STATUS: 1864 - case STATE_DATAOUT_STATUS_M: 1865 1868 ns->regs.count = ns->regs.num = 0; 1866 1869 break; 1867 1870 ··· 2000 2005 } 2001 2006 2002 2007 if (NS_STATE(ns->state) == STATE_DATAOUT_STATUS 2003 - || NS_STATE(ns->state) == STATE_DATAOUT_STATUS_M 2004 2008 || NS_STATE(ns->state) == STATE_DATAOUT) { 2005 2009 int row = ns->regs.row; 2006 2010