diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-26 10:43:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-26 10:52:19 +0200 |
| commit | 76b6f74c53974591c1c70535834e93e38103860f (patch) | |
| tree | 911a186bc310902d8f7fc2b261a7fe0ef1c5ca89 /drivers/mtd/nand/nand_mxs.c | |
| parent | 5723266adbaf7b835c9bee4ca1ca05a96f1bb25c (diff) | |
| download | barebox-76b6f74c53974591c1c70535834e93e38103860f.tar.gz barebox-76b6f74c53974591c1c70535834e93e38103860f.tar.xz | |
mtd: nand: Embed struct mtd_info into struct nand_chip
Similar to what is done in the Kernel. In the Kernel we have a struct
nand_device embedded into struct nand_chip and the nand_device has an
mtd_info embedded into it. Until we have struct nand_device we embed
mtd_info directly into the nand_chip.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand/nand_mxs.c')
| -rw-r--r-- | drivers/mtd/nand/nand_mxs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c index 1e0d6c73e4..36b6e7ac22 100644 --- a/drivers/mtd/nand/nand_mxs.c +++ b/drivers/mtd/nand/nand_mxs.c @@ -200,7 +200,6 @@ struct mxs_nand_info { void __iomem *io_base; void __iomem *bch_base; struct clk *clk; - struct mtd_info mtd; enum gpmi_type type; int dma_channel_base; u32 version; @@ -2030,7 +2029,7 @@ static void mxs_nand_compute_edo_timing(struct mxs_nand_info *info, static int mxs_nand_enable_edo_mode(struct mxs_nand_info *info) { struct nand_chip *chip = &info->nand_chip; - struct mtd_info *mtd = &info->mtd; + struct mtd_info *mtd = &chip->mtd; uint8_t feature[ONFI_SUBFEATURE_PARAM_LEN] = {}; int ret, mode; @@ -2196,8 +2195,7 @@ static int mxs_nand_probe(struct device_d *dev) /* structures must be linked */ chip = &nand_info->nand_chip; - mtd = &nand_info->mtd; - mtd->priv = chip; + mtd = &nand_info->nand_chip.mtd; mtd->parent = dev; chip->priv = nand_info; |