dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-03 08:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: Rename the nand_manufacturers struct

Browse Source 
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>
This commit is contained in:
Michael Trimarchi
2022-07-26 18:33:11 +02:00
parent f5abb5b110
commit 8a67acfce2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/nand/raw/nand_base.c
View File

@@ -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 * Returns a nand_manufacturer_desc object if the manufacturer is defined
* in the NAND manufacturers database, NULL otherwise. * 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; 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 nand_flash_dev *type)
{ {
struct mtd_info *mtd = &chip->mtd; struct mtd_info *mtd = &chip->mtd;
const struct nand_manufacturers *manufacturer_desc; const struct nand_manufacturer *manufacturer_desc;
int busw, ret; int busw, ret;
u8 *id_data = chip->id.data; u8 *id_data = chip->id.data;

2
drivers/mtd/nand/raw/nand_ids.c
View File

@@ -177,7 +177,7 @@ struct nand_flash_dev nand_flash_ids[] = {
}; };
/* Manufacturer 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_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},
{NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops}, {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
{NAND_MFR_FUJITSU, "Fujitsu"}, {NAND_MFR_FUJITSU, "Fujitsu"},

8
include/linux/mtd/rawnand.h
View File

@@ -976,7 +976,7 @@ struct nand_chip {
void *priv; void *priv;
struct { struct {
const struct nand_manufacturers *desc; const struct nand_manufacturer *desc;
void *priv; void *priv;
} manufacturer; } manufacturer;
}; };
@@ -1124,19 +1124,19 @@ struct nand_flash_dev {
}; };
/** /**
* struct nand_manufacturers - NAND Flash Manufacturer ID Structure * struct nand_manufacturer - NAND Flash Manufacturer ID Structure
* @name: Manufacturer name * @name: Manufacturer name
* @id: manufacturer ID code of device. * @id: manufacturer ID code of device.
* @ops: manufacturer operations * @ops: manufacturer operations
*/ */
struct nand_manufacturers { struct nand_manufacturer {
int id; int id;
char *name; char *name;
const struct nand_manufacturer_ops *ops; const struct nand_manufacturer_ops *ops;
}; };
extern struct nand_flash_dev nand_flash_ids[]; extern struct nand_flash_dev nand_flash_ids[];
extern struct nand_manufacturers nand_manuf_ids[]; extern struct nand_manufacturer nand_manuf_ids[];
extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops; extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;
extern const struct nand_manufacturer_ops samsung_nand_manuf_ops; extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;