mtd: rawnand: davinci: Inherit from nand_controller (3626fdcf) · Commits · 戴 / test

Let's not rely on the dummy_controller embedded in nand_chip.legacy and explicitly inherit from nand_controller instead. Signed-off-by:

drivers/mtd/nand/raw/davinci_nand.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		* outputs in a "wire-AND" configuration, with no per-chip signals.
		*/
		struct davinci_nand_info {
		struct nand_controller controller;
		struct nand_chip chip;

		struct platform_device *pdev;
		@@ -788,7 +789,9 @@ static int nand_davinci_probe(struct platform_device *pdev)
		spin_unlock_irq(&davinci_nand_lock);

		/* Scan to find existence of the device(s) */
		info->chip.legacy.dummy_controller.ops = &davinci_nand_controller_ops;
		nand_controller_init(&info->controller);
		info->controller.ops = &davinci_nand_controller_ops;
		info->chip.controller = &info->controller;
		ret = nand_scan(&info->chip, pdata->mask_chipsel ? 2 : 1);
		if (ret < 0) {
		dev_dbg(&pdev->dev, "no NAND chip(s) found\n");