diff options
| author | Boris BREZILLON | 2015-12-10 09:00:12 +0100 |
|---|---|---|
| committer | Brian Norris | 2015-12-18 19:54:41 +0100 |
| commit | a008deb1655ca7301dd388237aa60f867d9f784c (patch) | |
| tree | 51afed1d1026a72b0765704f537d5ea0ae6ae396 | |
| parent | mtd: nand: mpc5121: use the mtd instance embedded in struct nand_chip (diff) | |
| download | kernel-qcow2-linux-a008deb1655ca7301dd388237aa60f867d9f784c.tar.gz kernel-qcow2-linux-a008deb1655ca7301dd388237aa60f867d9f784c.tar.xz kernel-qcow2-linux-a008deb1655ca7301dd388237aa60f867d9f784c.zip | |
mtd: nand: mxc: use the mtd instance embedded in struct nand_chip
struct nand_chip now embeds an mtd device. Make use of this mtd instance.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index b291258bfe7b..9dd71af363c3 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -173,7 +173,6 @@ struct mxc_nand_devtype_data { }; struct mxc_nand_host { - struct mtd_info mtd; struct nand_chip nand; struct device *dev; @@ -1514,7 +1513,7 @@ static int mxcnd_probe(struct platform_device *pdev) host->dev = &pdev->dev; /* structures must be linked */ this = &host->nand; - mtd = &host->mtd; + mtd = nand_to_mtd(this); mtd->priv = this; mtd->dev.parent = &pdev->dev; mtd->name = DRIVER_NAME; @@ -1702,7 +1701,7 @@ static int mxcnd_remove(struct platform_device *pdev) { struct mxc_nand_host *host = platform_get_drvdata(pdev); - nand_release(&host->mtd); + nand_release(nand_to_mtd(&host->nand)); if (host->clk_act) clk_disable_unprepare(host->clk); |