Commit bfc535f4 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: fsmc: Stop passing mtd_info objects to internal functions 



Mimic what has been done in the core and stop passing mtd_info
objects to internal functions.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 5fb3dc11

drivers/mtd/nand/raw/fsmc_nand.c

+23 −28
Original line number Diff line number Diff line
@@ -248,9 +248,9 @@ static const struct mtd_ooblayout_ops fsmc_ecc4_ooblayout_ops = { 
	.free = fsmc_ecc4_ooblayout_free,

};



static inline struct fsmc_nand_data *mtd_to_fsmc(struct mtd_info *mtd)

static inline struct fsmc_nand_data *nand_to_fsmc(struct nand_chip *chip)

{

	return container_of(mtd_to_nand(mtd), struct fsmc_nand_data, nand);

	return container_of(chip, struct fsmc_nand_data, nand);

}



/*
@@ -369,7 +369,7 @@ static int fsmc_setup_data_interface(struct nand_chip *nand, int csline, 
 */

static void fsmc_enable_hwecc(struct nand_chip *chip, int mode)

{

	struct fsmc_nand_data *host = mtd_to_fsmc(nand_to_mtd(chip));

	struct fsmc_nand_data *host = nand_to_fsmc(chip);



	writel_relaxed(readl(host->regs_va + FSMC_PC) & ~FSMC_ECCPLEN_256,

		       host->regs_va + FSMC_PC);
@@ -387,7 +387,7 @@ static void fsmc_enable_hwecc(struct nand_chip *chip, int mode) 
static int fsmc_read_hwecc_ecc4(struct nand_chip *chip, const uint8_t *data,

				uint8_t *ecc)

{

	struct fsmc_nand_data *host = mtd_to_fsmc(nand_to_mtd(chip));

	struct fsmc_nand_data *host = nand_to_fsmc(chip);

	uint32_t ecc_tmp;

	unsigned long deadline = jiffies + FSMC_BUSY_WAIT_TIMEOUT;
@@ -435,7 +435,7 @@ static int fsmc_read_hwecc_ecc4(struct nand_chip *chip, const uint8_t *data, 
static int fsmc_read_hwecc_ecc1(struct nand_chip *chip, const uint8_t *data,

				uint8_t *ecc)

{

	struct fsmc_nand_data *host = mtd_to_fsmc(nand_to_mtd(chip));

	struct fsmc_nand_data *host = nand_to_fsmc(chip);

	uint32_t ecc_tmp;



	ecc_tmp = readl_relaxed(host->regs_va + ECC1);
@@ -537,13 +537,13 @@ unmap_dma: 


/*

 * fsmc_write_buf - write buffer to chip

 * @mtd:	MTD device structure

 * @host:	FSMC NAND controller

 * @buf:	data buffer

 * @len:	number of bytes to write

 */

static void fsmc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)

static void fsmc_write_buf(struct fsmc_nand_data *host, const uint8_t *buf,

			   int len)

{

	struct fsmc_nand_data *host  = mtd_to_fsmc(mtd);

	int i;



	if (IS_ALIGNED((uintptr_t)buf, sizeof(uint32_t)) &&
@@ -560,13 +560,12 @@ static void fsmc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len) 


/*

 * fsmc_read_buf - read chip data into buffer

 * @mtd:	MTD device structure

 * @host:	FSMC NAND controller

 * @buf:	buffer to store date

 * @len:	number of bytes to read

 */

static void fsmc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)

static void fsmc_read_buf(struct fsmc_nand_data *host, uint8_t *buf, int len)

{

	struct fsmc_nand_data *host  = mtd_to_fsmc(mtd);

	int i;



	if (IS_ALIGNED((uintptr_t)buf, sizeof(uint32_t)) &&
@@ -583,28 +582,25 @@ static void fsmc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) 


/*

 * fsmc_read_buf_dma - read chip data into buffer

 * @mtd:	MTD device structure

 * @host:	FSMC NAND controller

 * @buf:	buffer to store date

 * @len:	number of bytes to read

 */

static void fsmc_read_buf_dma(struct mtd_info *mtd, uint8_t *buf, int len)

static void fsmc_read_buf_dma(struct fsmc_nand_data *host, uint8_t *buf,

			      int len)

{

	struct fsmc_nand_data *host  = mtd_to_fsmc(mtd);



	dma_xfer(host, buf, len, DMA_FROM_DEVICE);

}



/*

 * fsmc_write_buf_dma - write buffer to chip

 * @mtd:	MTD device structure

 * @host:	FSMC NAND controller

 * @buf:	data buffer

 * @len:	number of bytes to write

 */

static void fsmc_write_buf_dma(struct mtd_info *mtd, const uint8_t *buf,

static void fsmc_write_buf_dma(struct fsmc_nand_data *host, const uint8_t *buf,

			       int len)

{

	struct fsmc_nand_data *host = mtd_to_fsmc(mtd);



	dma_xfer(host, (void *)buf, len, DMA_TO_DEVICE);

}
@@ -634,8 +630,7 @@ static void fsmc_ce_ctrl(struct fsmc_nand_data *host, bool assert) 
static int fsmc_exec_op(struct nand_chip *chip, const struct nand_operation *op,

			bool check_only)

{

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct fsmc_nand_data *host = mtd_to_fsmc(mtd);

	struct fsmc_nand_data *host = nand_to_fsmc(chip);

	const struct nand_op_instr *instr = NULL;

	int ret = 0;

	unsigned int op_id;
@@ -671,10 +666,10 @@ static int fsmc_exec_op(struct nand_chip *chip, const struct nand_operation *op, 
				 ", force 8-bit" : "");



			if (host->mode == USE_DMA_ACCESS)

				fsmc_read_buf_dma(mtd, instr->ctx.data.buf.in,

				fsmc_read_buf_dma(host, instr->ctx.data.buf.in,

						  instr->ctx.data.len);

			else

				fsmc_read_buf(mtd, instr->ctx.data.buf.in,

				fsmc_read_buf(host, instr->ctx.data.buf.in,

					      instr->ctx.data.len);

			break;
@@ -684,10 +679,10 @@ static int fsmc_exec_op(struct nand_chip *chip, const struct nand_operation *op, 
				 ", force 8-bit" : "");



			if (host->mode == USE_DMA_ACCESS)

				fsmc_write_buf_dma(mtd, instr->ctx.data.buf.out,

				fsmc_write_buf_dma(host, instr->ctx.data.buf.out,

						   instr->ctx.data.len);

			else

				fsmc_write_buf(mtd, instr->ctx.data.buf.out,

				fsmc_write_buf(host, instr->ctx.data.buf.out,

					       instr->ctx.data.len);

			break;
@@ -796,7 +791,7 @@ static int fsmc_read_page_hwecc(struct nand_chip *chip, uint8_t *buf, 
static int fsmc_bch8_correct_data(struct nand_chip *chip, uint8_t *dat,

				  uint8_t *read_ecc, uint8_t *calc_ecc)

{

	struct fsmc_nand_data *host = mtd_to_fsmc(nand_to_mtd(chip));

	struct fsmc_nand_data *host = nand_to_fsmc(chip);

	uint32_t err_idx[8];

	uint32_t num_err, i;

	uint32_t ecc1, ecc2, ecc3, ecc4;
@@ -923,7 +918,7 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev, 
static int fsmc_nand_attach_chip(struct nand_chip *nand)

{

	struct mtd_info *mtd = nand_to_mtd(nand);

	struct fsmc_nand_data *host = mtd_to_fsmc(mtd);

	struct fsmc_nand_data *host = nand_to_fsmc(nand);



	if (AMBA_REV_BITS(host->pid) >= 8) {

		switch (mtd->oobsize) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE