|
@@ -267,10 +267,10 @@ static void nand_onfi_timing_set(struct denali_nand_info *denali,
|
|
|
|
|
|
acc_clks = CEIL_DIV(Trea[mode], CLK_X);
|
|
|
|
|
|
- while (((acc_clks * CLK_X) - Trea[mode]) < 3)
|
|
|
+ while (acc_clks * CLK_X - Trea[mode] < 3)
|
|
|
acc_clks++;
|
|
|
|
|
|
- if ((data_invalid - acc_clks * CLK_X) < 2)
|
|
|
+ if (data_invalid - acc_clks * CLK_X < 2)
|
|
|
dev_warn(denali->dev, "%s, Line %d: Warning!\n",
|
|
|
__FILE__, __LINE__);
|
|
|
|
|
@@ -285,7 +285,7 @@ static void nand_onfi_timing_set(struct denali_nand_info *denali,
|
|
|
cs_cnt = 1;
|
|
|
|
|
|
if (Tcea[mode]) {
|
|
|
- while (((cs_cnt * CLK_X) + Trea[mode]) < Tcea[mode])
|
|
|
+ while (cs_cnt * CLK_X + Trea[mode] < Tcea[mode])
|
|
|
cs_cnt++;
|
|
|
}
|
|
|
|
|
@@ -295,8 +295,8 @@ static void nand_onfi_timing_set(struct denali_nand_info *denali,
|
|
|
#endif
|
|
|
|
|
|
/* Sighting 3462430: Temporary hack for MT29F128G08CJABAWP:B */
|
|
|
- if ((ioread32(denali->flash_reg + MANUFACTURER_ID) == 0) &&
|
|
|
- (ioread32(denali->flash_reg + DEVICE_ID) == 0x88))
|
|
|
+ if (ioread32(denali->flash_reg + MANUFACTURER_ID) == 0 &&
|
|
|
+ ioread32(denali->flash_reg + DEVICE_ID) == 0x88)
|
|
|
acc_clks = 6;
|
|
|
|
|
|
iowrite32(acc_clks, denali->flash_reg + ACC_CLKS);
|
|
@@ -577,7 +577,7 @@ static void denali_set_intr_modes(struct denali_nand_info *denali,
|
|
|
*/
|
|
|
static inline bool is_flash_bank_valid(int flash_bank)
|
|
|
{
|
|
|
- return (flash_bank >= 0 && flash_bank < 4);
|
|
|
+ return flash_bank >= 0 && flash_bank < 4;
|
|
|
}
|
|
|
|
|
|
static void denali_irq_init(struct denali_nand_info *denali)
|
|
@@ -1293,7 +1293,7 @@ static int denali_erase(struct mtd_info *mtd, int page)
|
|
|
irq_status = wait_for_irq(denali, INTR_STATUS__ERASE_COMP |
|
|
|
INTR_STATUS__ERASE_FAIL);
|
|
|
|
|
|
- return (irq_status & INTR_STATUS__ERASE_FAIL) ? NAND_STATUS_FAIL : PASS;
|
|
|
+ return irq_status & INTR_STATUS__ERASE_FAIL ? NAND_STATUS_FAIL : PASS;
|
|
|
}
|
|
|
|
|
|
static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
|