浏览代码

mtd: nand: remove unused function input parameter

The nand_get_flash_type parameter "busw" input value is not used by any
branch, and it is updated before use it in the function, so remove it,
define the "busw" as an internal variable.

Signed-off-by: Cai Zhiyong <caizhiyong@huawei.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cai Zhiyong 11 年之前
父节点
当前提交
bb77082fa2
共有 1 个文件被更改,包括 5 次插入7 次删除
  1. 5 7
      drivers/mtd/nand/nand_base.c

+ 5 - 7
drivers/mtd/nand/nand_base.c

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