diff options
| author | Michael Trimarchi <michael@amarulasolutions.com> | 2022-07-26 18:33:11 +0200 |
|---|---|---|
| committer | Michael Trimarchi <michael@amarulasolutions.com> | 2022-08-22 11:14:37 +0200 |
| commit | 8a67acfce24f825b4935c87b2dbd70915d6eeeaa (patch) | |
| tree | 8be529057adb9ebb21d298c9c8af2affaf4946e1 /drivers/mtd/nand | |
| parent | f5abb5b110c212f79db51600cbc69f63b905f362 (diff) | |
| download | u-boot-8a67acfce24f825b4935c87b2dbd70915d6eeeaa.zip u-boot-8a67acfce24f825b4935c87b2dbd70915d6eeeaa.tar.gz u-boot-8a67acfce24f825b4935c87b2dbd70915d6eeeaa.tar.bz2 | |
mtd: nand: Rename the nand_manufacturers struct
Upstream linux commit 8cfb9ab68f9070.
Drop the 's' at the end of nand_manufacturers since the struct is actually
describing a single manufacturer, not a manufacturer table.
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_ids.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 4b09a11..9d8ccfd 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4261,7 +4261,7 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, * Returns a nand_manufacturer_desc object if the manufacturer is defined * in the NAND manufacturers database, NULL otherwise. */ -static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id) +static const struct nand_manufacturer *nand_get_manufacturer_desc(u8 id) { int i; @@ -4281,7 +4281,7 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id, struct nand_flash_dev *type) { struct mtd_info *mtd = &chip->mtd; - const struct nand_manufacturers *manufacturer_desc; + const struct nand_manufacturer *manufacturer_desc; int busw, ret; u8 *id_data = chip->id.data; diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 4dece1b..d0cfacc 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -177,7 +177,7 @@ struct nand_flash_dev nand_flash_ids[] = { }; /* Manufacturer IDs */ -struct nand_manufacturers nand_manuf_ids[] = { +struct nand_manufacturer nand_manuf_ids[] = { {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops}, {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops}, {NAND_MFR_FUJITSU, "Fujitsu"}, |