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

Commit da59b453 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: vf610: Stop using the dummy controller obj 



The dummy controller is kept around to support old drivers. Let's
patch this one and declare our own nand_controller instance.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 4440f781

drivers/mtd/nand/raw/vf610_nfc.c

+5 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum vf610_nfc_variant { 
};



struct vf610_nfc {

	struct nand_controller base;

	struct nand_chip chip;

	struct device *dev;

	void __iomem *regs;
@@ -887,8 +888,11 @@ static int vf610_nfc_probe(struct platform_device *pdev) 


	vf610_nfc_preinit_controller(nfc);



	nand_controller_init(&nfc->base);

	nfc->base.ops = &vf610_nfc_controller_ops;

	chip->controller = &nfc->base;



	/* Scan the NAND chip */

	chip->dummy_controller.ops = &vf610_nfc_controller_ops;

	err = nand_scan(chip, 1);

	if (err)

		goto err_disable_clk;