On Tue, 26 May 2020 21:17:15 +0200 Miquel Raynal <miquel.raynal@xxxxxxxxxxx> wrote: > Do not access the SDR timings directly but use nand_get_sdr_timings() > instead. This way, future patching over this helper will be easier. > > Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> > --- > drivers/mtd/nand/raw/marvell_nand.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c > index 260a0430313e..ebf45a2754f1 100644 > --- a/drivers/mtd/nand/raw/marvell_nand.c > +++ b/drivers/mtd/nand/raw/marvell_nand.c > @@ -1096,6 +1096,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, > const u8 *oob_buf, bool raw, > int page) > { > + const struct nand_sdr_timings *sdr = nand_get_sdr_timings(&chip->data_interface); > struct marvell_nand_chip *marvell_nand = to_marvell_nand(chip); > struct marvell_nfc *nfc = to_marvell_nfc(chip->controller); > const struct marvell_hw_ecc_layout *lt = to_marvell_nand(chip)->layout; > @@ -1140,8 +1141,7 @@ static int marvell_nfc_hw_ecc_hmg_do_write_page(struct nand_chip *chip, > if (ret) > return ret; > > - ret = marvell_nfc_wait_op(chip, > - PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max)); > + ret = marvell_nfc_wait_op(chip, PSEC_TO_MSEC(sdr->tPROG_max)); > return ret; > } > > @@ -1562,6 +1562,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip, > const u8 *buf, > int oob_required, int page) > { > + const struct nand_sdr_timings *sdr = nand_get_sdr_timings(&chip->data_interface); > struct mtd_info *mtd = nand_to_mtd(chip); > const struct marvell_hw_ecc_layout *lt = to_marvell_nand(chip)->layout; > const u8 *data = buf; > @@ -1598,8 +1599,7 @@ static int marvell_nfc_hw_ecc_bch_write_page(struct nand_chip *chip, > marvell_nfc_wait_ndrun(chip); > } > > - ret = marvell_nfc_wait_op(chip, > - PSEC_TO_MSEC(chip->data_interface.timings.sdr.tPROG_max)); > + ret = marvell_nfc_wait_op(chip, PSEC_TO_MSEC(sdr->tPROG_max)); > > marvell_nfc_disable_hw_ecc(chip); > ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/