Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44b07b92 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Rename nand_default_bbt() into nand_create_bbt() 



Rename nand_default_bbt() into nand_create_bbt() and pass it a nand_chip
object to prepare removal of the chip->scan_bbt() hook.

We add a temporary nand_default_bbt() wrapper which will be dropped
after the removal of ->scan_bbt().

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 1c3ab61e

drivers/mtd/nand/raw/nand_base.c

+5 −0
Original line number Diff line number Diff line
@@ -4924,6 +4924,11 @@ static void nand_shutdown(struct mtd_info *mtd) 
	nand_get_device(mtd, FL_PM_SUSPENDED);

}



static int nand_default_bbt(struct mtd_info *mtd)

{

	return nand_create_bbt(mtd_to_nand(mtd));

}



/* Set default functions */

static void nand_set_defaults(struct nand_chip *chip)

{

drivers/mtd/nand/raw/nand_bbt.c

+5 −5
Original line number Diff line number Diff line
@@ -1349,15 +1349,14 @@ static int nand_create_badblock_pattern(struct nand_chip *this) 
}



/**

 * nand_default_bbt - [NAND Interface] Select a default bad block table for the device

 * @mtd: MTD device structure

 * nand_create_bbt - [NAND Interface] Select a default bad block table for the device

 * @this: NAND chip object

 *

 * This function selects the default bad block table support for the device and

 * calls the nand_scan_bbt function.

 */

int nand_default_bbt(struct mtd_info *mtd)

int nand_create_bbt(struct nand_chip *this)

{

	struct nand_chip *this = mtd_to_nand(mtd);

	int ret;



	/* Is a flash based bad block table requested? */
@@ -1383,8 +1382,9 @@ int nand_default_bbt(struct mtd_info *mtd) 
			return ret;

	}



	return nand_scan_bbt(mtd, this->badblock_pattern);

	return nand_scan_bbt(nand_to_mtd(this), this->badblock_pattern);

}

EXPORT_SYMBOL(nand_create_bbt);



/**

 * nand_isreserved_bbt - [NAND Interface] Check if a block is reserved

include/linux/mtd/rawnand.h

+1 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ extern const struct nand_manufacturer_ops micron_nand_manuf_ops; 
extern const struct nand_manufacturer_ops amd_nand_manuf_ops;

extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;



int nand_default_bbt(struct mtd_info *mtd);

int nand_create_bbt(struct nand_chip *chip);

int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);

int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs);

int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt);