Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a99d1796 authored by Chuanxiao Dong's avatar Chuanxiao Dong Committed by David Woodhouse
Browse files

mtd: denali.c: fix reserved all check-patch errors 



Signed-off-by: default avatarChuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent bdca6dae

drivers/mtd/nand/denali.c

+53 −49
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static const uint32_t reset_complete[4] = {INTR_STATUS0__RST_COMP, 
							INTR_STATUS3__RST_COMP};



/* specifies the debug level of the driver */

static int nand_debug_level = 0;

static int nand_debug_level;



/* forward declarations */

static void clear_interrupts(struct denali_nand_info *denali);
@@ -991,7 +991,7 @@ static void denali_irq_enable(struct denali_nand_info *denali, 
 */

static inline uint32_t denali_irq_detected(struct denali_nand_info *denali)

{

	return (read_interrupt_status(denali) & DENALI_IRQ_ALL);

	return read_interrupt_status(denali) & DENALI_IRQ_ALL;

}



/* Interrupts are cleared by writing a 1 to the appropriate status bit */
@@ -1172,9 +1172,12 @@ static int denali_send_pipeline_cmd(struct denali_nand_info *denali, 
	uint32_t addr = 0x0, cmd = 0x0, page_count = 1, irq_status = 0,

		 irq_mask = 0;



	if (op == DENALI_READ) irq_mask = INTR_STATUS0__LOAD_COMP;

	else if (op == DENALI_WRITE) irq_mask = 0;

	else BUG();

	if (op == DENALI_READ)

		irq_mask = INTR_STATUS0__LOAD_COMP;

	else if (op == DENALI_WRITE)

		irq_mask = 0;

	else

		BUG();



	setup_ecc_for_xfer(denali, ecc_en, transfer_spare);
@@ -1448,7 +1451,8 @@ static void denali_enable_dma(struct denali_nand_info *denali, bool en) 
{

	uint32_t reg_val = 0x0;



	if (en) reg_val = DMA_ENABLE__FLAG;

	if (en)

		reg_val = DMA_ENABLE__FLAG;



	denali_write32(reg_val, denali->flash_reg + DMA_ENABLE);

	ioread32(denali->flash_reg + DMA_ENABLE);
@@ -1807,7 +1811,7 @@ static void denali_hw_init(struct denali_nand_info *denali) 
}



/* ECC layout for SLC devices. Denali spec indicates SLC fixed at 4 bytes */

#define ECC_BYTES_SLC   4 * (2048 / ECC_SECTOR_SIZE)

#define ECC_BYTES_SLC   (4 * (2048 / ECC_SECTOR_SIZE))

static struct nand_ecclayout nand_oob_slc = {

	.eccbytes = 4,

	.eccpos = { 0, 1, 2, 3 }, /* not used */
@@ -1819,7 +1823,7 @@ static struct nand_ecclayout nand_oob_slc = { 
	}

};



#define ECC_BYTES_MLC   14 * (2048 / ECC_SECTOR_SIZE)

#define ECC_BYTES_MLC   (14 * (2048 / ECC_SECTOR_SIZE))

static struct nand_ecclayout nand_oob_mlc_14bit = {

	.eccbytes = 14,

	.eccpos = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* not used */