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/denali.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/denali.c')
-rw-r--r-- | drivers/mtd/nand/denali.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 13d10ae..d9bcd72 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -48,7 +48,8 @@ static int onfi_timing_mode = NAND_DEFAULT_TIMINGS; * this macro allows us to convert from an MTD structure to our own * device context (denali) structure. */ -#define mtd_to_denali(m) container_of(m->priv, struct denali_nand_info, nand) +#define mtd_to_denali(m) \ + container_of(mtd_to_nand(m), struct denali_nand_info, nand) /* * These constants are defined by the driver to enable common driver @@ -1179,7 +1180,6 @@ static int denali_init(struct denali_nand_info *denali) denali->mtd->name = "denali-nand"; denali->mtd->owner = THIS_MODULE; - denali->mtd->priv = &denali->nand; /* register the driver with the NAND core subsystem */ denali->nand.select_chip = denali_select_chip; |