Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: nand: Get rid of mtd variable in function calls

Browse source 
chip points to mtd. Passing chip is enough to have a reference
to mtd when is necessary

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
This commit is contained in:
Michael Trimarchi 2022-07-20 18:22:07 +02:00
parent b8cd2df519
commit 9d1806fadc
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/mtd/nand/raw/nand_base.c
View file

@ -4160,8 +4160,9 @@ static int nand_get_bits_per_cell(u8 cellinfo)
* chip. The rest of the parameters must be decoded according to generic or * chip. The rest of the parameters must be decoded according to generic or
* manufacturer-specific "extended ID" decoding patterns. * manufacturer-specific "extended ID" decoding patterns.
*/ */
static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) static void nand_decode_ext_id(struct nand_chip *chip)
{ {
struct mtd_info *mtd = &chip->mtd;
int extid, id_len; int extid, id_len;
/* The 3rd id byte holds MLC / multichip data */ /* The 3rd id byte holds MLC / multichip data */
chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]);
@ -4291,7 +4292,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip)
* compliant and does not have a full-id or legacy-id entry in the nand_ids * compliant and does not have a full-id or legacy-id entry in the nand_ids
* table. * table.
*/ */
static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chip) static void nand_manufacturer_detect(struct nand_chip *chip)
{ {
/* /*
* Try manufacturer detection if available and use * Try manufacturer detection if available and use
@ -4301,7 +4302,7 @@ static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chi
chip->manufacturer.desc->ops->detect) chip->manufacturer.desc->ops->detect)
chip->manufacturer.desc->ops->detect(chip); chip->manufacturer.desc->ops->detect(chip);
else else
nand_decode_ext_id(mtd, chip); nand_decode_ext_id(chip);
} }
/* /*
@ -4324,9 +4325,9 @@ static int nand_manufacturer_init(struct nand_chip *chip)
* decodes a matching ID table entry and assigns the MTD size parameters for * decodes a matching ID table entry and assigns the MTD size parameters for
* the chip. * the chip.
*/ */
static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type)
struct nand_flash_dev *type)
{ {
struct mtd_info *mtd = &chip->mtd;
int maf_id = chip->id.data[0]; int maf_id = chip->id.data[0];
mtd->erasesize = type->erasesize; mtd->erasesize = type->erasesize;
@ -4439,11 +4440,11 @@ static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id)
/* /*
* Get the flash and manufacturer id and lookup if the type is supported. * Get the flash and manufacturer id and lookup if the type is supported.
*/ */
struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id,
struct nand_chip *chip, int *dev_id,
int *maf_id, int *dev_id,
struct nand_flash_dev *type) struct nand_flash_dev *type)
{ {
struct mtd_info *mtd = &chip->mtd;
const struct nand_manufacturers *manufacturer_desc; const struct nand_manufacturers *manufacturer_desc;
int busw, ret; int busw, ret;
u8 *id_data = chip->id.data; u8 *id_data = chip->id.data;
@ -4539,9 +4540,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
chip->chipsize = (uint64_t)type->chipsize << 20; chip->chipsize = (uint64_t)type->chipsize << 20;
if (!type->pagesize) { if (!type->pagesize) {
nand_manufacturer_detect(mtd, chip); nand_manufacturer_detect(chip);
} else { } else {
nand_decode_id(mtd, chip, type); nand_decode_id(chip, type);
} }
/* Get chip options */ /* Get chip options */
@ -4729,7 +4730,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16); nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
/* Read the flash type */ /* Read the flash type */
type = nand_get_flash_type(mtd, chip, &nand_maf_id, type = nand_get_flash_type(chip, &nand_maf_id,
&nand_dev_id, table); &nand_dev_id, table);
if (IS_ERR(type)) { if (IS_ERR(type)) {

3
include/linux/mtd/rawnand.h
View file

@ -29,8 +29,7 @@ struct nand_flash_dev;
struct device_node; struct device_node;
/* Get the flash and manufacturer id and lookup if the type is supported. */ /* Get the flash and manufacturer id and lookup if the type is supported. */
struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip,
struct nand_chip *chip,
int *maf_id, int *dev_id, int *maf_id, int *dev_id,
struct nand_flash_dev *type); struct nand_flash_dev *type);