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

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

mips: nand: make use of mtd_to_nand() where appropriate 



mtd_to_nand() was recently introduced to avoid direct accesses to the
mtd->priv field. Update all MIPS specific implementations to use this
helper.

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

arch/mips/alchemy/devboards/db1200.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static struct i2c_board_info db1200_i2c_devs[] __initdata = { 
static void au1200_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,

				 unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	unsigned long ioaddr = (unsigned long)this->IO_ADDR_W;



	ioaddr &= 0xffffff00;

arch/mips/alchemy/devboards/db1300.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void __init db1300_gpio_config(void) 
static void au1300_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,

				 unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	unsigned long ioaddr = (unsigned long)this->IO_ADDR_W;



	ioaddr &= 0xffffff00;

arch/mips/alchemy/devboards/db1550.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct i2c_board_info db1550_i2c_devs[] __initdata = { 
static void au1550_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,

				 unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	unsigned long ioaddr = (unsigned long)this->IO_ADDR_W;



	ioaddr &= 0xffffff00;

arch/mips/pnx833x/common/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static struct platform_device pnx833x_sata_device = { 
static void

pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{

	struct nand_chip *this = mtd->priv;

	struct nand_chip *this = mtd_to_nand(mtd);

	unsigned long nandaddr = (unsigned long)this->IO_ADDR_W;



	if (cmd == NAND_CMD_NONE)

arch/mips/rb532/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int rb532_dev_ready(struct mtd_info *mtd) 


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

{

	struct nand_chip *chip = mtd->priv;

	struct nand_chip *chip = mtd_to_nand(mtd);

	unsigned char orbits, nandbits;



	if (ctrl & NAND_CTRL_CHANGE) {