diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-08-14 00:46:05 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-02 23:11:40 +0200 |
| commit | 1976367173a47f801c67b5f456922d79c60d0d42 (patch) | |
| tree | 55a67d031aa49b5a072201522b2e2153a76b62ad /drivers/mtd/spi-nor/nxp-spifi.c | |
| parent | mtd: spi-nor: add forward declaration for mtd_info (diff) | |
| download | linux-1976367173a47f801c67b5f456922d79c60d0d42.tar.xz linux-1976367173a47f801c67b5f456922d79c60d0d42.zip | |
mtd: spi-nor: embed struct mtd_info within struct spi_nor
This reflects the proper layering, so let's do it.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Tested-by: Joachim Eastwood <manabian@gmail.com>
Diffstat (limited to 'drivers/mtd/spi-nor/nxp-spifi.c')
| -rw-r--r-- | drivers/mtd/spi-nor/nxp-spifi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c index ce6a478a02a5..0f6b452574bd 100644 --- a/drivers/mtd/spi-nor/nxp-spifi.c +++ b/drivers/mtd/spi-nor/nxp-spifi.c @@ -60,7 +60,6 @@ struct nxp_spifi { struct clk *clk_reg; void __iomem *io_base; void __iomem *flash_base; - struct mtd_info mtd; struct spi_nor nor; bool memory_mode; u32 mcmd; @@ -331,7 +330,6 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi, writel(ctrl, spifi->io_base + SPIFI_CTRL); - spifi->nor.mtd = &spifi->mtd; spifi->nor.dev = spifi->dev; spifi->nor.priv = spifi; spifi->nor.read = nxp_spifi_read; @@ -364,7 +362,7 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi, } ppdata.of_node = np; - ret = mtd_device_parse_register(&spifi->mtd, NULL, &ppdata, NULL, 0); + ret = mtd_device_parse_register(&spifi->nor.mtd, NULL, &ppdata, NULL, 0); if (ret) { dev_err(spifi->dev, "mtd device parse failed\n"); return ret; @@ -453,7 +451,7 @@ static int nxp_spifi_remove(struct platform_device *pdev) { struct nxp_spifi *spifi = platform_get_drvdata(pdev); - mtd_device_unregister(&spifi->mtd); + mtd_device_unregister(&spifi->nor.mtd); clk_disable_unprepare(spifi->clk_spifi); clk_disable_unprepare(spifi->clk_reg); |