|
@@ -3549,10 +3549,10 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
|
|
|
*/
|
|
|
static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
|
|
|
struct nand_chip *chip,
|
|
|
- int busw,
|
|
|
int *maf_id, int *dev_id,
|
|
|
struct nand_flash_dev *type)
|
|
|
{
|
|
|
+ int busw;
|
|
|
int i, maf_idx;
|
|
|
u8 id_data[8];
|
|
|
|
|
@@ -3722,18 +3722,16 @@ ident_done:
|
|
|
int nand_scan_ident(struct mtd_info *mtd, int maxchips,
|
|
|
struct nand_flash_dev *table)
|
|
|
{
|
|
|
- int i, busw, nand_maf_id, nand_dev_id;
|
|
|
+ int i, nand_maf_id, nand_dev_id;
|
|
|
struct nand_chip *chip = mtd->priv;
|
|
|
struct nand_flash_dev *type;
|
|
|
|
|
|
- /* Get buswidth to select the correct functions */
|
|
|
- busw = chip->options & NAND_BUSWIDTH_16;
|
|
|
/* Set the default functions */
|
|
|
- nand_set_defaults(chip, busw);
|
|
|
+ nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
|
|
|
|
|
|
/* Read the flash type */
|
|
|
- type = nand_get_flash_type(mtd, chip, busw,
|
|
|
- &nand_maf_id, &nand_dev_id, table);
|
|
|
+ type = nand_get_flash_type(mtd, chip, &nand_maf_id,
|
|
|
+ &nand_dev_id, table);
|
|
|
|
|
|
if (IS_ERR(type)) {
|
|
|
if (!(chip->options & NAND_SCAN_SILENT_NODEV))
|