Re: [PATCH 08/10] mtd: rawnand: vf610: Stop using the dummy controller obj

Stefan Agner
2018-11-23T23:13:43Z

On 20.11.2018 10:02, Boris Brezillon wrote:
> The dummy controller is kept around to support old drivers. Let's
> patch this one and declare our own nand_controller instance.

Reviewed-by: Stefan Agner <stefan@agner.ch>

--
Stefan

>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> drivers/mtd/nand/raw/vf610_nfc.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
> index 845a639b0595..2e8b7e9314a3 100644
> --- a/drivers/mtd/nand/raw/vf610_nfc.c
> +++ b/drivers/mtd/nand/raw/vf610_nfc.c
> @@ -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;