Commit 4bd4ebcc authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: nand: make use of mtd_to_nand() in NAND drivers 



mtd_to_nand() was recently introduced to avoid direct accesses to the
mtd->priv field. Update all NAND drivers to use it.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent a83dfa92

drivers/mtd/nand/ams-delta.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct mtd_partition partition_info[] = { 


static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	void __iomem *io_base = this->priv;



	writew(0, io_base + OMAP_MPUIO_IO_CNTL);
@@ -77,7 +77,7 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) 
static u_char ams_delta_read_byte(struct mtd_info *mtd)

{

	u_char res;

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	void __iomem *io_base = this->priv;



	gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0);

drivers/mtd/nand/atmel_nand.c

+25 −25
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void atmel_nand_disable(struct atmel_nand_host *host) 
 */

static void atmel_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	if (ctrl & NAND_CTRL_CHANGE) {
@@ -205,7 +205,7 @@ static void atmel_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl 
 */

static int atmel_nand_device_ready(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	return gpio_get_value(host->board.rdy_pin) ^
@@ -215,7 +215,7 @@ static int atmel_nand_device_ready(struct mtd_info *mtd) 
/* Set up for hardware ready pin and enable pin. */

static int atmel_nand_set_enable_ready_pins(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;

	int res = 0;
@@ -267,7 +267,7 @@ static int atmel_nand_set_enable_ready_pins(struct mtd_info *mtd) 
 */

static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len)

{

	struct nand_chip	*nand_chip = mtd->priv;

	struct nand_chip	*nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
@@ -280,7 +280,7 @@ static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len) 


static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)

{

	struct nand_chip	*nand_chip = mtd->priv;

	struct nand_chip	*nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	if (host->nfc && host->nfc->use_nfc_sram && host->nfc->data_in_sram) {
@@ -293,14 +293,14 @@ static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len) 


static void atmel_write_buf8(struct mtd_info *mtd, const u8 *buf, int len)

{

	struct nand_chip	*nand_chip = mtd->priv;

	struct nand_chip	*nand_chip = mtd_to_nand(mtd);



	__raw_writesb(nand_chip->IO_ADDR_W, buf, len);

}



static void atmel_write_buf16(struct mtd_info *mtd, const u8 *buf, int len)

{

	struct nand_chip	*nand_chip = mtd->priv;

	struct nand_chip	*nand_chip = mtd_to_nand(mtd);



	__raw_writesw(nand_chip->IO_ADDR_W, buf, len / 2);

}
@@ -352,7 +352,7 @@ static int atmel_nand_dma_op(struct mtd_info *mtd, void *buf, int len, 
	dma_addr_t dma_src_addr, dma_dst_addr, phys_addr;

	struct dma_async_tx_descriptor *tx = NULL;

	dma_cookie_t cookie;

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;

	void *p = buf;

	int err = -EIO;
@@ -425,7 +425,7 @@ static int atmel_nand_dma_op(struct mtd_info *mtd, void *buf, int len, 


static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;



	if (use_dma && len > mtd->oobsize)
@@ -441,7 +441,7 @@ static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len) 


static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;



	if (use_dma && len > mtd->oobsize)
@@ -533,7 +533,7 @@ static int pmecc_data_alloc(struct atmel_nand_host *host) 


static void pmecc_gen_syndrome(struct mtd_info *mtd, int sector)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	int i;

	uint32_t value;
@@ -550,7 +550,7 @@ static void pmecc_gen_syndrome(struct mtd_info *mtd, int sector) 


static void pmecc_substitute(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	int16_t __iomem *alpha_to = host->pmecc_alpha_to;

	int16_t __iomem *index_of = host->pmecc_index_of;
@@ -592,7 +592,7 @@ static void pmecc_substitute(struct mtd_info *mtd) 


static void pmecc_get_sigma(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	int16_t *lmu = host->pmecc_lmu;
@@ -750,7 +750,7 @@ static void pmecc_get_sigma(struct mtd_info *mtd) 


static int pmecc_err_location(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	unsigned long end_time;

	const int cap = host->pmecc_corr_cap;
@@ -802,7 +802,7 @@ static int pmecc_err_location(struct mtd_info *mtd) 
static void pmecc_correct_data(struct mtd_info *mtd, uint8_t *buf, uint8_t *ecc,

		int sector_num, int extra_bytes, int err_nbr)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	int i = 0;

	int byte_pos, bit_pos, sector_size, pos;
@@ -848,7 +848,7 @@ static void pmecc_correct_data(struct mtd_info *mtd, uint8_t *buf, uint8_t *ecc, 
static int pmecc_correction(struct mtd_info *mtd, u32 pmecc_stat, uint8_t *buf,

	u8 *ecc)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	int i, err_nbr;

	uint8_t *buf_pos;
@@ -992,7 +992,7 @@ static int atmel_nand_pmecc_write_page(struct mtd_info *mtd, 


static void atmel_pmecc_core_init(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	uint32_t val = 0;

	struct nand_ecclayout *ecc_layout;
@@ -1308,7 +1308,7 @@ static int atmel_pmecc_nand_init_params(struct platform_device *pdev, 
static int atmel_nand_calculate(struct mtd_info *mtd,

		const u_char *dat, unsigned char *ecc_code)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	unsigned int ecc_value;
@@ -1412,7 +1412,7 @@ static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip, 
static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat,

		u_char *read_ecc, u_char *isnull)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;

	unsigned int ecc_status;

	unsigned int ecc_word, ecc_bit;
@@ -1478,7 +1478,7 @@ static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat, 
 */

static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	if (host->board.need_reset_workaround)
@@ -1771,7 +1771,7 @@ static int nfc_send_command(struct atmel_nand_host *host, 
static int nfc_device_ready(struct mtd_info *mtd)

{

	u32 status, mask;

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	status = nfc_read_status(host);
@@ -1787,7 +1787,7 @@ static int nfc_device_ready(struct mtd_info *mtd) 


static void nfc_select_chip(struct mtd_info *mtd, int chip)

{

	struct nand_chip *nand_chip = mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = nand_chip->priv;



	if (chip == -1)
@@ -1799,7 +1799,7 @@ static void nfc_select_chip(struct mtd_info *mtd, int chip) 
static int nfc_make_addr(struct mtd_info *mtd, int command, int column,

		int page_addr, unsigned int *addr1234, unsigned int *cycle0)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);



	int acycle = 0;

	unsigned char addr_bytes[8];
@@ -1839,7 +1839,7 @@ static int nfc_make_addr(struct mtd_info *mtd, int command, int column, 
static void nfc_nand_command(struct mtd_info *mtd, unsigned int command,

				int column, int page_addr)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;

	unsigned long timeout;

	unsigned int nfc_addr_cmd = 0;
@@ -2026,7 +2026,7 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip, 


static int nfc_sram_init(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	struct atmel_nand_host *host = chip->priv;

	int res = 0;

drivers/mtd/nand/au1550nd.c

+11 −11
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct au1550nd_ctx { 
 */

static u_char au_read_byte(struct mtd_info *mtd)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	u_char ret = readb(this->IO_ADDR_R);

	wmb(); /* drain writebuffer */

	return ret;
@@ -54,7 +54,7 @@ static u_char au_read_byte(struct mtd_info *mtd) 
 */

static void au_write_byte(struct mtd_info *mtd, u_char byte)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	writeb(byte, this->IO_ADDR_W);

	wmb(); /* drain writebuffer */

}
@@ -67,7 +67,7 @@ static void au_write_byte(struct mtd_info *mtd, u_char byte) 
 */

static u_char au_read_byte16(struct mtd_info *mtd)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	u_char ret = (u_char) cpu_to_le16(readw(this->IO_ADDR_R));

	wmb(); /* drain writebuffer */

	return ret;
@@ -82,7 +82,7 @@ static u_char au_read_byte16(struct mtd_info *mtd) 
 */

static void au_write_byte16(struct mtd_info *mtd, u_char byte)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);

	wmb(); /* drain writebuffer */

}
@@ -95,7 +95,7 @@ static void au_write_byte16(struct mtd_info *mtd, u_char byte) 
 */

static u16 au_read_word(struct mtd_info *mtd)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	u16 ret = readw(this->IO_ADDR_R);

	wmb(); /* drain writebuffer */

	return ret;
@@ -112,7 +112,7 @@ static u16 au_read_word(struct mtd_info *mtd) 
static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);



	for (i = 0; i < len; i++) {

		writeb(buf[i], this->IO_ADDR_W);
@@ -131,7 +131,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len) 
static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);



	for (i = 0; i < len; i++) {

		buf[i] = readb(this->IO_ADDR_R);
@@ -150,7 +150,7 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len) 
static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	u16 *p = (u16 *) buf;

	len >>= 1;
@@ -172,7 +172,7 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len) 
static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)

{

	int i;

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	u16 *p = (u16 *) buf;

	len >>= 1;
@@ -198,7 +198,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) 
static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)

{

	struct au1550nd_ctx *ctx = container_of(mtd, struct au1550nd_ctx, info);

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);



	switch (cmd) {
@@ -268,7 +268,7 @@ static void au1550_select_chip(struct mtd_info *mtd, int chip) 
static void au1550_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)

{

	struct au1550nd_ctx *ctx = container_of(mtd, struct au1550nd_ctx, info);

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	int ce_override = 0, i;

	unsigned long flags = 0;

drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c

+8 −8
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int bcm47xxnflash_ops_bcm4706_poll(struct bcma_drv_cc *cc) 
static void bcm47xxnflash_ops_bcm4706_read(struct mtd_info *mtd, uint8_t *buf,

					   int len)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;



	u32 ctlcode;
@@ -139,7 +139,7 @@ static void bcm47xxnflash_ops_bcm4706_read(struct mtd_info *mtd, uint8_t *buf, 
static void bcm47xxnflash_ops_bcm4706_write(struct mtd_info *mtd,

					    const uint8_t *buf, int len)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;

	struct bcma_drv_cc *cc = b47n->cc;
@@ -173,7 +173,7 @@ static void bcm47xxnflash_ops_bcm4706_write(struct mtd_info *mtd, 
static void bcm47xxnflash_ops_bcm4706_cmd_ctrl(struct mtd_info *mtd, int cmd,

					       unsigned int ctrl)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;

	u32 code = 0;
@@ -199,7 +199,7 @@ static void bcm47xxnflash_ops_bcm4706_select_chip(struct mtd_info *mtd, 


static int bcm47xxnflash_ops_bcm4706_dev_ready(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;



	return !!(bcma_cc_read32(b47n->cc, BCMA_CC_NFLASH_CTL) & NCTL_READY);
@@ -216,7 +216,7 @@ static void bcm47xxnflash_ops_bcm4706_cmdfunc(struct mtd_info *mtd, 
					      unsigned command, int column,

					      int page_addr)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;

	struct bcma_drv_cc *cc = b47n->cc;

	u32 ctlcode;
@@ -312,7 +312,7 @@ static void bcm47xxnflash_ops_bcm4706_cmdfunc(struct mtd_info *mtd, 


static u8 bcm47xxnflash_ops_bcm4706_read_byte(struct mtd_info *mtd)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;

	struct bcma_drv_cc *cc = b47n->cc;

	u32 tmp = 0;
@@ -341,7 +341,7 @@ static u8 bcm47xxnflash_ops_bcm4706_read_byte(struct mtd_info *mtd) 
static void bcm47xxnflash_ops_bcm4706_read_buf(struct mtd_info *mtd,

					       uint8_t *buf, int len)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;



	switch (b47n->curr_command) {
@@ -357,7 +357,7 @@ static void bcm47xxnflash_ops_bcm4706_read_buf(struct mtd_info *mtd, 
static void bcm47xxnflash_ops_bcm4706_write_buf(struct mtd_info *mtd,

						const uint8_t *buf, int len)

{

	struct nand_chip *nand_chip = (struct nand_chip *)mtd->priv;

	struct nand_chip *nand_chip = mtd_to_nand(mtd);

	struct bcm47xxnflash *b47n = (struct bcm47xxnflash *)nand_chip->priv;



	switch (b47n->curr_command) {

drivers/mtd/nand/bf5xx_nand.c

+6 −6
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int bf5xx_nand_correct_data_256(struct mtd_info *mtd, u_char *dat, 
static int bf5xx_nand_correct_data(struct mtd_info *mtd, u_char *dat,

					u_char *read_ecc, u_char *calc_ecc)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	int ret;



	ret = bf5xx_nand_correct_data_256(mtd, dat, read_ecc, calc_ecc);
@@ -329,7 +329,7 @@ static int bf5xx_nand_calculate_ecc(struct mtd_info *mtd, 
		const u_char *dat, u_char *ecc_code)

{

	struct bf5xx_nand_info *info = mtd_to_nand_info(mtd);

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	u16 ecc0, ecc1;

	u32 code[2];

	u8 *p;
@@ -466,7 +466,7 @@ static void bf5xx_nand_dma_rw(struct mtd_info *mtd, 
				uint8_t *buf, int is_read)

{

	struct bf5xx_nand_info *info = mtd_to_nand_info(mtd);

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	unsigned short val;



	dev_dbg(info->device, " mtd->%p, buf->%p, is_read %d\n",
@@ -532,7 +532,7 @@ static void bf5xx_nand_dma_read_buf(struct mtd_info *mtd, 
					uint8_t *buf, int len)

{

	struct bf5xx_nand_info *info = mtd_to_nand_info(mtd);

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);



	dev_dbg(info->device, "mtd->%p, buf->%p, int %d\n", mtd, buf, len);
@@ -546,7 +546,7 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd, 
				const uint8_t *buf, int len)

{

	struct bf5xx_nand_info *info = mtd_to_nand_info(mtd);

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);



	dev_dbg(info->device, "mtd->%p, buf->%p, len %d\n", mtd, buf, len);
@@ -685,7 +685,7 @@ static int bf5xx_nand_remove(struct platform_device *pdev) 


static int bf5xx_nand_scan(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	int ret;



	ret = nand_scan_ident(mtd, 1, NULL);