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/atmel_nand.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/atmel_nand.c')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index b7c23f8f10..f3875a5648 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -77,7 +77,6 @@ static struct nand_ecclayout atmel_oobinfo_small = { struct atmel_nand_host { struct nand_chip nand_chip; - struct mtd_info mtd; void __iomem *io_base; struct atmel_nand_data *board; struct device_d *dev; @@ -862,8 +861,8 @@ static int __init atmel_pmecc_nand_init_params(struct device_d *dev, struct atmel_nand_host *host) { struct resource *iores; - struct mtd_info *mtd = &host->mtd; struct nand_chip *nand_chip = &host->nand_chip; + struct mtd_info *mtd = &nand_chip->mtd; int cap, sector_size, err_no; int ret; @@ -1251,8 +1250,8 @@ static int atmel_hw_nand_init_params(struct device_d *dev, struct atmel_nand_host *host) { struct resource *iores; - struct mtd_info *mtd = &host->mtd; struct nand_chip *nand_chip = &host->nand_chip; + struct mtd_info *mtd = &nand_chip->mtd; iores = dev_request_mem_resource(dev, 1); if (IS_ERR(iores)) @@ -1328,8 +1327,8 @@ static int __init atmel_nand_probe(struct device_d *dev) return PTR_ERR(iores); host->io_base = IOMEM(iores->start); - mtd = &host->mtd; nand_chip = &host->nand_chip; + mtd = &nand_chip->mtd; host->board = pdata; host->dev = dev; @@ -1342,7 +1341,6 @@ static int __init atmel_nand_probe(struct device_d *dev) } nand_chip->priv = host; /* link the private data structures */ - mtd->priv = nand_chip; mtd->parent = dev; /* Set address of NAND IO lines */ |