From: Miquel Raynal Date: Mon, 24 Sep 2018 09:35:18 +0000 (+0200) Subject: mtd: rawnand: toshiba: Pass a single nand_chip object to the status helper X-Git-Tag: v4.20-rc1~187^2^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e9836761867519e1e5beb7486dc73c3d5b8877f5;p=linux.git mtd: rawnand: toshiba: Pass a single nand_chip object to the status helper Now that most of the raw NAND API is consistent and has almost all its helpers and hooks using a single nand_chip object instead of an mtd_info one (or both), let's do the same cleanup in the raw NAND vendors drivers. Apply this change to the Toshiba driver so that the internal helper to retrieve the ECC status does only take a nand_chip object. Suggested-by: Boris Brezillon Signed-off-by: Miquel Raynal Reviewed-by: Boris Brezillon --- diff --git a/drivers/mtd/nand/raw/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c index 941ddc615190..d068163b64b3 100644 --- a/drivers/mtd/nand/raw/nand_toshiba.c +++ b/drivers/mtd/nand/raw/nand_toshiba.c @@ -23,9 +23,9 @@ /* Recommended to rewrite for BENAND */ #define TOSHIBA_NAND_STATUS_REWRITE_RECOMMENDED BIT(3) -static int toshiba_nand_benand_eccstatus(struct mtd_info *mtd, - struct nand_chip *chip) +static int toshiba_nand_benand_eccstatus(struct nand_chip *chip) { + struct mtd_info *mtd = nand_to_mtd(chip); int ret; unsigned int max_bitflips = 0; u8 status; @@ -51,21 +51,19 @@ static int toshiba_nand_read_page_benand(struct nand_chip *chip, uint8_t *buf, int oob_required, int page) { - struct mtd_info *mtd = nand_to_mtd(chip); int ret; ret = nand_read_page_raw(chip, buf, oob_required, page); if (ret) return ret; - return toshiba_nand_benand_eccstatus(mtd, chip); + return toshiba_nand_benand_eccstatus(chip); } static int toshiba_nand_read_subpage_benand(struct nand_chip *chip, uint32_t data_offs, uint32_t readlen, uint8_t *bufpoi, int page) { - struct mtd_info *mtd = nand_to_mtd(chip); int ret; ret = nand_read_page_op(chip, page, data_offs, @@ -73,7 +71,7 @@ toshiba_nand_read_subpage_benand(struct nand_chip *chip, uint32_t data_offs, if (ret) return ret; - return toshiba_nand_benand_eccstatus(mtd, chip); + return toshiba_nand_benand_eccstatus(chip); } static void toshiba_nand_benand_init(struct nand_chip *chip)