diff options
author | Scott Wood <oss@buserror.net> | 2016-05-30 13:57:56 -0500 |
---|---|---|
committer | Scott Wood <oss@buserror.net> | 2016-06-03 20:27:48 -0500 |
commit | 17cb4b8f327eb983cef7c510fcf77f1635a00e48 (patch) | |
tree | bbe2c31df8189cfb1e02a60e6ca803509169f71d /drivers/mtd/nand/vf610_nfc.c | |
parent | b616d9b0a708eb90eb474e1b6ec6dfe4c48a1678 (diff) | |
download | u-boot-imx-17cb4b8f327eb983cef7c510fcf77f1635a00e48.zip u-boot-imx-17cb4b8f327eb983cef7c510fcf77f1635a00e48.tar.gz u-boot-imx-17cb4b8f327eb983cef7c510fcf77f1635a00e48.tar.bz2 |
mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data
These functions are part of the Linux 4.6 sync. They are being added
before the main sync patch in order to make it easier to address the
issue across all NAND drivers (many/most of which do not closely track
their Linux counterparts) separately from other merge issues.
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'drivers/mtd/nand/vf610_nfc.c')
-rw-r--r-- | drivers/mtd/nand/vf610_nfc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c index 3be8b02..a4d5a62 100644 --- a/drivers/mtd/nand/vf610_nfc.c +++ b/drivers/mtd/nand/vf610_nfc.c @@ -155,8 +155,7 @@ struct vf610_nfc { enum vf610_nfc_alt_buf alt_buf; }; -#define mtd_to_nfc(_mtd) \ - (struct vf610_nfc *)((struct nand_chip *)_mtd->priv)->priv +#define mtd_to_nfc(_mtd) nand_get_controller_data(mtd_to_nand(_mtd)) #if defined(CONFIG_SYS_NAND_VF610_NFC_45_ECC_BYTES) #define ECC_HW_MODE ECC_45_BYTE @@ -653,9 +652,8 @@ static int vf610_nfc_nand_init(int devnum, void __iomem *addr) chip = &nfc->chip; nfc->regs = addr; - mtd = &chip->mtd; - mtd->priv = chip; - chip->priv = nfc; + mtd = nand_to_mtd(chip); + nand_set_controller_data(chip, nfc); if (cfg.width == 16) chip->options |= NAND_BUSWIDTH_16; |