mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
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>
This commit is contained in:
parent
f5abb5b110
commit
8a67acfce2
3 changed files with 7 additions and 7 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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"},
|
||||
|
|
|
@ -976,7 +976,7 @@ struct nand_chip {
|
|||
void *priv;
|
||||
|
||||
struct {
|
||||
const struct nand_manufacturers *desc;
|
||||
const struct nand_manufacturer *desc;
|
||||
void *priv;
|
||||
} 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
|
||||
* @id: manufacturer ID code of device.
|
||||
* @ops: manufacturer operations
|
||||
*/
|
||||
struct nand_manufacturers {
|
||||
struct nand_manufacturer {
|
||||
int id;
|
||||
char *name;
|
||||
const struct nand_manufacturer_ops *ops;
|
||||
};
|
||||
|
||||
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 samsung_nand_manuf_ops;
|
||||
|
|
Loading…
Reference in a new issue