diff options
| author | Joern Engel <joern@wh.fh-wedel.de> | 2006-05-22 23:18:12 +0200 |
|---|---|---|
| committer | Joern Engel <joern@wh.fh-wedel.de> | 2006-05-22 23:18:12 +0200 |
| commit | c8b229de2b05c2b3e8d282ce260935a88ac030ca (patch) | |
| tree | 09391866a6a9740df2a178c7894557025c9dc2c8 /fs/jffs2/fs.c | |
| parent | 28318776a80bc3261f9af91ef79e6e38bb9f5bec (diff) | |
| download | kernel_samsung_smdk4412-c8b229de2b05c2b3e8d282ce260935a88ac030ca.zip kernel_samsung_smdk4412-c8b229de2b05c2b3e8d282ce260935a88ac030ca.tar.gz kernel_samsung_smdk4412-c8b229de2b05c2b3e8d282ce260935a88ac030ca.tar.bz2 | |
[MTD] Merge STMicro NOR_ECC code with Intel Sibley code
In 2002, STMicro started producing NOR flashes with internal ECC protection
for small blocks (8 or 16 bytes). Support for those flashes was added by me.
In 2005, Intel Sibley flashes copied this strategy and Nico added support for
those. Merge the code for both.
Signed-off-by: Joern Engel <joern@wh.fh-wedel.de>
Diffstat (limited to 'fs/jffs2/fs.c')
| -rw-r--r-- | fs/jffs2/fs.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index a0f8467..79f7025 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -664,13 +664,6 @@ static int jffs2_flash_setup(struct jffs2_sb_info *c) { return ret; } - /* add setups for other bizarre flashes here... */ - if (jffs2_nor_ecc(c)) { - ret = jffs2_nor_ecc_flash_setup(c); - if (ret) - return ret; - } - /* and Dataflash */ if (jffs2_dataflash(c)) { ret = jffs2_dataflash_setup(c); @@ -694,11 +687,6 @@ void jffs2_flash_cleanup(struct jffs2_sb_info *c) { jffs2_nand_flash_cleanup(c); } - /* add cleanups for other bizarre flashes here... */ - if (jffs2_nor_ecc(c)) { - jffs2_nor_ecc_flash_cleanup(c); - } - /* and DataFlash */ if (jffs2_dataflash(c)) { jffs2_dataflash_cleanup(c); |