| Message ID | 20200427082028.394719-11-boris.brezillon@collabora.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | mtd: rawnand: cafe: Convert to exec_op() (and more) | expand |
Hi Boris, Boris Brezillon <boris.brezillon@collabora.com> wrote on Mon, 27 Apr 2020 10:20:20 +0200: > Explicitly inherit from nand_controller instead of using the dummy > controller object. > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/mtd/nand/raw/cafe_nand.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c > index 348debbc04af..2825489a71b8 100644 > --- a/drivers/mtd/nand/raw/cafe_nand.c > +++ b/drivers/mtd/nand/raw/cafe_nand.c > @@ -146,6 +146,7 @@ > #define CAFE_FIELD_GET(reg, field, val) FIELD_GET(CAFE_##reg##_##field, val) > > struct cafe_priv { > + struct nand_controller base; > struct nand_chip nand; > struct pci_dev *pdev; > void __iomem *mmio; > @@ -920,7 +921,9 @@ static int cafe_nand_probe(struct pci_dev *pdev, > cafe->usedma = 0; > > /* Scan to find existence of the device */ > - cafe->nand.legacy.dummy_controller.ops = &cafe_nand_controller_ops; > + nand_controller_init(&cafe->base); > + cafe->base.ops = &cafe_nand_controller_ops; > + cafe->nand.controller = &cafe->base; > err = nand_scan(&cafe->nand, 2); > if (err) > goto out_irq; Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c index 348debbc04af..2825489a71b8 100644 --- a/drivers/mtd/nand/raw/cafe_nand.c +++ b/drivers/mtd/nand/raw/cafe_nand.c @@ -146,6 +146,7 @@ #define CAFE_FIELD_GET(reg, field, val) FIELD_GET(CAFE_##reg##_##field, val) struct cafe_priv { + struct nand_controller base; struct nand_chip nand; struct pci_dev *pdev; void __iomem *mmio; @@ -920,7 +921,9 @@ static int cafe_nand_probe(struct pci_dev *pdev, cafe->usedma = 0; /* Scan to find existence of the device */ - cafe->nand.legacy.dummy_controller.ops = &cafe_nand_controller_ops; + nand_controller_init(&cafe->base); + cafe->base.ops = &cafe_nand_controller_ops; + cafe->nand.controller = &cafe->base; err = nand_scan(&cafe->nand, 2); if (err) goto out_irq;
Explicitly inherit from nand_controller instead of using the dummy controller object. Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> --- drivers/mtd/nand/raw/cafe_nand.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)