Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 960823a2 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

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: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent a3f54377
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -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;