diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-01-29 15:58:08 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-25 06:39:03 -0500 |
commit | e99e90aef17517d99be8e049b2f5cc563cd6862a (patch) | |
tree | 3d5c62f96cf9167b48eecec2254193525010dce8 /drivers/mtd/nand/nandsim.c | |
parent | 677c2aec8cdd5ae33b5fab266941cf6c6dc4d59f (diff) |
mtd: nandsim: Define CONFIG_NANDSIM_MAX_PARTS and use it instead of MAX_MTD_DEVICES
MAX_MTD_DEVICES is about to be removed.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/nandsim.c')
-rw-r--r-- | drivers/mtd/nand/nandsim.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 3cf918048673..8a0a5d16e0eb 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c | |||
@@ -80,6 +80,9 @@ | |||
80 | #ifndef CONFIG_NANDSIM_DBG | 80 | #ifndef CONFIG_NANDSIM_DBG |
81 | #define CONFIG_NANDSIM_DBG 0 | 81 | #define CONFIG_NANDSIM_DBG 0 |
82 | #endif | 82 | #endif |
83 | #ifndef CONFIG_NANDSIM_MAX_PARTS | ||
84 | #define CONFIG_NANDSIM_MAX_PARTS 32 | ||
85 | #endif | ||
83 | 86 | ||
84 | static uint first_id_byte = CONFIG_NANDSIM_FIRST_ID_BYTE; | 87 | static uint first_id_byte = CONFIG_NANDSIM_FIRST_ID_BYTE; |
85 | static uint second_id_byte = CONFIG_NANDSIM_SECOND_ID_BYTE; | 88 | static uint second_id_byte = CONFIG_NANDSIM_SECOND_ID_BYTE; |
@@ -94,7 +97,7 @@ static uint bus_width = CONFIG_NANDSIM_BUS_WIDTH; | |||
94 | static uint do_delays = CONFIG_NANDSIM_DO_DELAYS; | 97 | static uint do_delays = CONFIG_NANDSIM_DO_DELAYS; |
95 | static uint log = CONFIG_NANDSIM_LOG; | 98 | static uint log = CONFIG_NANDSIM_LOG; |
96 | static uint dbg = CONFIG_NANDSIM_DBG; | 99 | static uint dbg = CONFIG_NANDSIM_DBG; |
97 | static unsigned long parts[MAX_MTD_DEVICES]; | 100 | static unsigned long parts[CONFIG_NANDSIM_MAX_PARTS]; |
98 | static unsigned int parts_num; | 101 | static unsigned int parts_num; |
99 | static char *badblocks = NULL; | 102 | static char *badblocks = NULL; |
100 | static char *weakblocks = NULL; | 103 | static char *weakblocks = NULL; |
@@ -288,7 +291,7 @@ union ns_mem { | |||
288 | * The structure which describes all the internal simulator data. | 291 | * The structure which describes all the internal simulator data. |
289 | */ | 292 | */ |
290 | struct nandsim { | 293 | struct nandsim { |
291 | struct mtd_partition partitions[MAX_MTD_DEVICES]; | 294 | struct mtd_partition partitions[CONFIG_NANDSIM_MAX_PARTS]; |
292 | unsigned int nbparts; | 295 | unsigned int nbparts; |
293 | 296 | ||
294 | uint busw; /* flash chip bus width (8 or 16) */ | 297 | uint busw; /* flash chip bus width (8 or 16) */ |