diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2015-12-10 09:00:29 +0100 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-12-18 10:54:41 -0800 |
| commit | 960823a226b37eea01151d608636d09d1abac8f9 (patch) | |
| tree | 280f1487fefbba8ddbc9bf95470907ccc1cf7d3b /drivers/mtd/nand/vf610_nfc.c | |
| parent | a3f5437788fde26f9354324cb711461bdc02c6e0 (diff) | |
mtd: nand: vf610: 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>
Diffstat (limited to 'drivers/mtd/nand/vf610_nfc.c')
| -rw-r--r-- | drivers/mtd/nand/vf610_nfc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c index 1c86c6b42515..1bbb93a7b4e5 100644 --- a/drivers/mtd/nand/vf610_nfc.c +++ b/drivers/mtd/nand/vf610_nfc.c @@ -156,7 +156,6 @@ enum vf610_nfc_variant { }; struct vf610_nfc { - struct mtd_info mtd; struct nand_chip chip; struct device *dev; void __iomem *regs; @@ -171,7 +170,10 @@ struct vf610_nfc { u32 ecc_mode; }; -#define mtd_to_nfc(_mtd) container_of(_mtd, struct vf610_nfc, mtd) +static inline struct vf610_nfc *mtd_to_nfc(struct mtd_info *mtd) +{ + return container_of(mtd_to_nand(mtd), struct vf610_nfc, chip); +} static struct nand_ecclayout vf610_nfc_ecc45 = { .eccbytes = 45, @@ -674,8 +676,8 @@ static int vf610_nfc_probe(struct platform_device *pdev) return -ENOMEM; nfc->dev = &pdev->dev; - mtd = &nfc->mtd; chip = &nfc->chip; + mtd = nand_to_mtd(chip); mtd->priv = chip; mtd->owner = THIS_MODULE; |