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

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

drivers/mtd/nand/denali.c

+1 −14
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ MODULE_PARM_DESC(onfi_timing_mode, 
 */

#define CHIP_SELECT_INVALID	-1



#define SUPPORT_8BITECC		1



/*

 * This macro divides two integers and rounds fractional values up

 * to the nearest integer value.
@@ -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

	 */

	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);

#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,
@@ -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(224, denali->flash_reg + DEVICE_SPARE_AREA_SIZE);

		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;

	default:

		dev_warn(denali->dev,

drivers/mtd/nand/denali.h

+0 −3
Original line number Diff line number Diff line
@@ -292,9 +292,6 @@ 
#define CLK_X  5

#define CLK_MULTI 4



#define SUPPORT_15BITECC        1

#define SUPPORT_8BITECC         1



#define ONFI_BLOOM_TIME         1

#define MODE5_WORKAROUND        0

CRA Git | Maintained and supported by SUSTech CRA and CCSE