dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 18:22:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: change return type of nand_get_flash_type() to int

Browse Source 
Upstream linux commit 4722c0e958e636.

The returned "type" is never used in nand_scan_ident() and spl code

Make nand_get_flash_type() simply return an integer value in order
to avoid unnecessary ERR_PTR/PTR_ERR dance.

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-25 10:06:06 +02:00
parent 8a67acfce2
commit c76f9ddf91
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/nand/raw/mt7621_nand.c
View File

@@ -1184,13 +1184,13 @@ int mt7621_nfc_spl_post_init(struct mt7621_nfc *nfc)
{ {
struct nand_chip *nand = &nfc->nand; struct nand_chip *nand = &nfc->nand;
int nand_maf_id, nand_dev_id; int nand_maf_id, nand_dev_id;
struct nand_flash_dev *type; int ret;
type = nand_get_flash_type(nand, &nand_maf_id, ret = nand_get_flash_type(nand, &nand_maf_id,
&nand_dev_id, NULL); &nand_dev_id, NULL);
if (IS_ERR(type)) if (ret)
return PTR_ERR(type); return ret;
nand->numchips = 1; nand->numchips = 1;
nand->mtd.size = nand->chipsize; nand->mtd.size = nand->chipsize;

8
drivers/mtd/nand/raw/mxs_nand_spl.c
View File

@@ -81,13 +81,13 @@ static int mxs_flash_full_ident(struct mtd_info *mtd)
{ {
int nand_maf_id, nand_dev_id; int nand_maf_id, nand_dev_id;
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
struct nand_flash_dev *type; int ret;
type = nand_get_flash_type(mtd, chip, &nand_maf_id, &nand_dev_id, NULL); ret = nand_get_flash_type(mtd, chip, &nand_maf_id, &nand_dev_id, NULL);
if (IS_ERR(type)) { if (ret) {
chip->select_chip(mtd, -1); chip->select_chip(mtd, -1);
return PTR_ERR(type); return ret;
} }
return 0; return 0;

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

@@ -4276,9 +4276,8 @@ static const struct nand_manufacturer *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 nand_chip *chip, int *maf_id, int nand_get_flash_type(struct nand_chip *chip, int *maf_id,
int *dev_id, int *dev_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_manufacturer *manufacturer_desc; const struct nand_manufacturer *manufacturer_desc;
@@ -4291,7 +4290,7 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id,
*/ */
ret = nand_reset(chip, 0); ret = nand_reset(chip, 0);
if (ret) if (ret)
return ERR_PTR(ret); return ret;
/* Select the device */ /* Select the device */
chip->select_chip(mtd, 0); chip->select_chip(mtd, 0);
@@ -4299,7 +4298,7 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id,
/* Send the command for reading device ID */ /* Send the command for reading device ID */
ret = nand_readid_op(chip, 0, id_data, 2); ret = nand_readid_op(chip, 0, id_data, 2);
if (ret) if (ret)
return ERR_PTR(ret); return ret;
/* Read manufacturer and device IDs */ /* Read manufacturer and device IDs */
*maf_id = id_data[0]; *maf_id = id_data[0];
@@ -4315,12 +4314,12 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id,
/* Read entire ID string */ /* Read entire ID string */
ret = nand_readid_op(chip, 0, id_data, 8); ret = nand_readid_op(chip, 0, id_data, 8);
if (ret) if (ret)
return ERR_PTR(ret); return ret;
if (id_data[0] != *maf_id || id_data[1] != *dev_id) { if (id_data[0] != *maf_id || id_data[1] != *dev_id) {
pr_info("second ID read did not match %02x,%02x against %02x,%02x\n", pr_info("second ID read did not match %02x,%02x against %02x,%02x\n",
*maf_id, *dev_id, id_data[0], id_data[1]); *maf_id, *dev_id, id_data[0], id_data[1]);
return ERR_PTR(-ENODEV); return -ENODEV;
} }
chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data)); chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data));
@@ -4368,7 +4367,7 @@ struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id,
} }
if (!type->name) if (!type->name)
return ERR_PTR(-ENODEV); return -ENODEV;
if (!mtd->name) if (!mtd->name)
mtd->name = type->name; mtd->name = type->name;
@@ -4401,7 +4400,7 @@ ident_done:
pr_warn("bus width %d instead %d bit\n", pr_warn("bus width %d instead %d bit\n",
(chip->options & NAND_BUSWIDTH_16) ? 16 : 8, (chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
busw ? 16 : 8); busw ? 16 : 8);
return ERR_PTR(-EINVAL); return -EINVAL;
} }
nand_decode_bbm_options(mtd, chip); nand_decode_bbm_options(mtd, chip);
@@ -4432,7 +4431,7 @@ ident_done:
ret = nand_manufacturer_init(chip); ret = nand_manufacturer_init(chip);
if (ret) if (ret)
return ERR_PTR(ret); return ret;
pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
*maf_id, *dev_id); *maf_id, *dev_id);
@@ -4460,7 +4459,7 @@ ident_done:
pr_info("%d MiB, %s, erase size: %d KiB, page size: %d, OOB size: %d\n", pr_info("%d MiB, %s, erase size: %d KiB, page size: %d, OOB size: %d\n",
(int)(chip->chipsize >> 20), nand_is_slc(chip) ? "SLC" : "MLC", (int)(chip->chipsize >> 20), nand_is_slc(chip) ? "SLC" : "MLC",
mtd->erasesize >> 10, mtd->writesize, mtd->oobsize); mtd->erasesize >> 10, mtd->writesize, mtd->oobsize);
return type; return 0;
} }
EXPORT_SYMBOL(nand_get_flash_type); EXPORT_SYMBOL(nand_get_flash_type);
@@ -4547,7 +4546,6 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
{ {
int i, nand_maf_id, nand_dev_id; int i, nand_maf_id, nand_dev_id;
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
struct nand_flash_dev *type;
int ret; int ret;
if (ofnode_valid(chip->flash_node)) { if (ofnode_valid(chip->flash_node)) {
@@ -4560,14 +4558,14 @@ 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(chip, &nand_maf_id, ret = nand_get_flash_type(chip, &nand_maf_id,
&nand_dev_id, table); &nand_dev_id, table);
if (IS_ERR(type)) { if (ret) {
if (!(chip->options & NAND_SCAN_SILENT_NODEV)) if (!(chip->options & NAND_SCAN_SILENT_NODEV))
pr_warn("No NAND device found\n"); pr_warn("No NAND device found\n");
chip->select_chip(mtd, -1); chip->select_chip(mtd, -1);
return PTR_ERR(type); return ret;
} }
/* Initialize the ->data_interface field. */ /* Initialize the ->data_interface field. */

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 nand_chip *chip, int nand_get_flash_type(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);
/* Scan and identify a NAND device */ /* Scan and identify a NAND device */