On 28.02.20 04:11, Yoshio Furuyama wrote: > The suffix was changed to classify from "g" to "j" between 1st generation > device and 2nd generation device that's new Serial NAND of Kioxia brand. I had to read this sentence multiple times to understand it. Maybe something like this would be better: The suffix was changed from "g" to "j" to classify between 1st generation and 2nd generation serial NAND devices (which now belong to the Kioxia brand). > As reference that's > 1st generation device of 1Gbit product is "tc58cvg0s3hraig" > 2nd generation device of 1Gbit product is "tc58cvg0s3hraij". > > The 8Gbit product "TH58CxG3S0HRAIJ" is new line up of Kioxia's serial nand > and changed the prefix from tc58 to th58. > Thus it was changed argument to the function from "tc58cxgxsx" to > "tx58cxgxsxraix". Same here. It is very hard to read. I would write something like this: The 8Gbit type "TH58CxG3S0HRAIJ" is new to Kioxia's serial NAND lineup and the prefix was changed from "TC58" to "TH85". Thus the functions were renamed from tc58cxgxsx_*() to tx58cxgxsxraix_*(). With an easier to understand commit message: Reviewed-by: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx> > > Signed-off-by: Yoshio Furuyama <ytc-mb-yfuruyama7@xxxxxxxxxx> > --- > changelog[v2]:Split 2 patches, and add patch description. > > drivers/mtd/nand/spi/toshiba.c | 60 +++++++++++++++++++++--------------------- > 1 file changed, 30 insertions(+), 30 deletions(-) > > diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c > index 0db5ee4..700d86f 100644 > --- a/drivers/mtd/nand/spi/toshiba.c > +++ b/drivers/mtd/nand/spi/toshiba.c > @@ -25,8 +25,8 @@ static SPINAND_OP_VARIANTS(write_cache_variants, > static SPINAND_OP_VARIANTS(update_cache_variants, > SPINAND_PROG_LOAD(false, 0, NULL, 0)); > > -static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section, > - struct mtd_oob_region *region) > +static int tx58cxgxsxraix_ooblayout_ecc(struct mtd_info *mtd, int section, > + struct mtd_oob_region *region) > { > if (section > 0) > return -ERANGE; > @@ -37,8 +37,8 @@ static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section, > return 0; > } > > -static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section, > - struct mtd_oob_region *region) > +static int tx58cxgxsxraix_ooblayout_free(struct mtd_info *mtd, int section, > + struct mtd_oob_region *region) > { > if (section > 0) > return -ERANGE; > @@ -50,13 +50,13 @@ static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section, > return 0; > } > > -static const struct mtd_ooblayout_ops tc58cxgxsx_ooblayout = { > - .ecc = tc58cxgxsx_ooblayout_ecc, > - .free = tc58cxgxsx_ooblayout_free, > +static const struct mtd_ooblayout_ops tx58cxgxsxraix_ooblayout = { > + .ecc = tx58cxgxsxraix_ooblayout_ecc, > + .free = tx58cxgxsxraix_ooblayout_free, > }; > > -static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand, > - u8 status) > +static int tx58cxgxsxraix_ecc_get_status(struct spinand_device *spinand, > + u8 status) > { > struct nand_device *nand = spinand_to_nand(spinand); > u8 mbf = 0; > @@ -95,75 +95,75 @@ static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand, > > static const struct spinand_info toshiba_spinand_table[] = { > /* 3.3V 1Gb */ > - SPINAND_INFO("TC58CVG0S3", 0xC2, > + SPINAND_INFO("TC58CVG0S3HRAIG", 0xC2, > NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 3.3V 2Gb */ > - SPINAND_INFO("TC58CVG1S3", 0xCB, > + SPINAND_INFO("TC58CVG1S3HRAIG", 0xCB, > NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 3.3V 4Gb */ > - SPINAND_INFO("TC58CVG2S0", 0xCD, > + SPINAND_INFO("TC58CVG2S0HRAIG", 0xCD, > NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 3.3V 4Gb */ > - SPINAND_INFO("TC58CVG2S0", 0xED, > + SPINAND_INFO("TC58CVG2S0HRAIJ", 0xED, > NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 1.8V 1Gb */ > - SPINAND_INFO("TC58CYG0S3", 0xB2, > + SPINAND_INFO("TC58CYG0S3HRAIG", 0xB2, > NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 1.8V 2Gb */ > - SPINAND_INFO("TC58CYG1S3", 0xBB, > + SPINAND_INFO("TC58CYG1S3HRAIG", 0xBB, > NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > /* 1.8V 4Gb */ > - SPINAND_INFO("TC58CYG2S0", 0xBD, > + SPINAND_INFO("TC58CYG2S0HRAIG", 0xBD, > NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), > NAND_ECCREQ(8, 512), > SPINAND_INFO_OP_VARIANTS(&read_cache_variants, > &write_cache_variants, > &update_cache_variants), > 0, > - SPINAND_ECCINFO(&tc58cxgxsx_ooblayout, > - tc58cxgxsx_ecc_get_status)), > + SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout, > + tx58cxgxsxraix_ecc_get_status)), > }; > > static int toshiba_spinand_detect(struct spinand_device *spinand) > ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/