Commit e713ddd8 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon

mtd: nand: denali: remove unnecessary writes to ECC_CORRECTION

Because SUPPORT_15BITECC is defined, the following is dead code:

  #elif SUPPORT_8BITECC
          iowrite32(8, denali->flash_reg + ECC_CORRECTION);
  #endif

Such ifdefs are useless and unacceptable coding style.

These writes are not needed in the first place since ECC_CORRECTION
is set up by the nand_init() function.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 6652ef88
...@@ -62,8 +62,6 @@ MODULE_PARM_DESC(onfi_timing_mode, ...@@ -62,8 +62,6 @@ MODULE_PARM_DESC(onfi_timing_mode,
*/ */
#define CHIP_SELECT_INVALID -1 #define CHIP_SELECT_INVALID -1
#define SUPPORT_8BITECC 1
/* /*
* This macro divides two integers and rounds fractional values up * This macro divides two integers and rounds fractional values up
* to the nearest integer value. * to the nearest integer value.
...@@ -347,14 +345,8 @@ static void get_toshiba_nand_para(struct denali_nand_info *denali) ...@@ -347,14 +345,8 @@ static void get_toshiba_nand_para(struct denali_nand_info *denali)
* spare area size for some kind of Toshiba NAND device * spare area size for some kind of Toshiba NAND device
*/ */
if ((ioread32(denali->flash_reg + DEVICE_MAIN_AREA_SIZE) == 4096) && if ((ioread32(denali->flash_reg + DEVICE_MAIN_AREA_SIZE) == 4096) &&
(ioread32(denali->flash_reg + DEVICE_SPARE_AREA_SIZE) == 64)) { (ioread32(denali->flash_reg + DEVICE_SPARE_AREA_SIZE) == 64))
iowrite32(216, denali->flash_reg + DEVICE_SPARE_AREA_SIZE); iowrite32(216, denali->flash_reg + DEVICE_SPARE_AREA_SIZE);
#if SUPPORT_15BITECC
iowrite32(15, denali->flash_reg + ECC_CORRECTION);
#elif SUPPORT_8BITECC
iowrite32(8, denali->flash_reg + ECC_CORRECTION);
#endif
}
} }
static void get_hynix_nand_para(struct denali_nand_info *denali, static void get_hynix_nand_para(struct denali_nand_info *denali,
...@@ -367,11 +359,6 @@ static void get_hynix_nand_para(struct denali_nand_info *denali, ...@@ -367,11 +359,6 @@ static void get_hynix_nand_para(struct denali_nand_info *denali,
iowrite32(4096, denali->flash_reg + DEVICE_MAIN_AREA_SIZE); iowrite32(4096, denali->flash_reg + DEVICE_MAIN_AREA_SIZE);
iowrite32(224, denali->flash_reg + DEVICE_SPARE_AREA_SIZE); iowrite32(224, denali->flash_reg + DEVICE_SPARE_AREA_SIZE);
iowrite32(0, denali->flash_reg + DEVICE_WIDTH); iowrite32(0, denali->flash_reg + DEVICE_WIDTH);
#if SUPPORT_15BITECC
iowrite32(15, denali->flash_reg + ECC_CORRECTION);
#elif SUPPORT_8BITECC
iowrite32(8, denali->flash_reg + ECC_CORRECTION);
#endif
break; break;
default: default:
dev_warn(denali->dev, dev_warn(denali->dev,
......
...@@ -292,9 +292,6 @@ ...@@ -292,9 +292,6 @@
#define CLK_X 5 #define CLK_X 5
#define CLK_MULTI 4 #define CLK_MULTI 4
#define SUPPORT_15BITECC 1
#define SUPPORT_8BITECC 1
#define ONFI_BLOOM_TIME 1 #define ONFI_BLOOM_TIME 1
#define MODE5_WORKAROUND 0 #define MODE5_WORKAROUND 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment