On Mon, 25 May 2020 19:42:30 +0200 Miquel Raynal <miquel.raynal@xxxxxxxxxxx> wrote: > This is really a NAND controller hook so call it > nand_controller_has_setup_data_interface(), which makes much more > sense. > > Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> > --- > drivers/mtd/nand/raw/internals.h | 2 +- > drivers/mtd/nand/raw/nand_base.c | 6 +++--- > drivers/mtd/nand/raw/nand_legacy.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/raw/internals.h b/drivers/mtd/nand/raw/internals.h > index a518acfd9b3f..347d42c55353 100644 > --- a/drivers/mtd/nand/raw/internals.h > +++ b/drivers/mtd/nand/raw/internals.h > @@ -130,7 +130,7 @@ static inline int nand_exec_op(struct nand_chip *chip, > return chip->controller->ops->exec_op(chip, op, false); > } > > -static inline bool nand_has_setup_data_iface(struct nand_chip *chip) > +static inline bool nand_controller_has_setup_data_iface(struct nand_chip *chip) > { > if (!chip->controller || !chip->controller->ops || > !chip->controller->ops->setup_data_interface) > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index 514ac78899ec..d446394a2ea0 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -910,7 +910,7 @@ static int nand_reset_data_interface(struct nand_chip *chip, int chipnr) > { > int ret; > > - if (!nand_has_setup_data_iface(chip)) > + if (!nand_controller_has_setup_data_iface(chip)) > return 0; > > /* > @@ -955,7 +955,7 @@ static int nand_setup_data_interface(struct nand_chip *chip, int chipnr) > u8 tmode_param[ONFI_SUBFEATURE_PARAM_LEN] = { mode, }; > int ret; > > - if (!nand_has_setup_data_iface(chip)) > + if (!nand_controller_has_setup_data_iface(chip)) > return 0; > > /* Change the mode on the chip side (if supported by the NAND chip) */ > @@ -1024,7 +1024,7 @@ static int nand_init_data_interface(struct nand_chip *chip) > { > int modes, mode, ret; > > - if (!nand_has_setup_data_iface(chip)) > + if (!nand_controller_has_setup_data_iface(chip)) > return 0; > > /* > diff --git a/drivers/mtd/nand/raw/nand_legacy.c b/drivers/mtd/nand/raw/nand_legacy.c > index d64791c06a97..8b91aa7773d8 100644 > --- a/drivers/mtd/nand/raw/nand_legacy.c > +++ b/drivers/mtd/nand/raw/nand_legacy.c > @@ -365,7 +365,7 @@ static void nand_ccs_delay(struct nand_chip *chip) > * Wait tCCS_min if it is correctly defined, otherwise wait 500ns > * (which should be safe for all NANDs). > */ > - if (nand_has_setup_data_iface(chip)) > + if (nand_controller_has_setup_data_iface(chip)) > ndelay(chip->data_interface.timings.sdr.tCCS_min / 1000); > else > ndelay(500); ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/