mtd: nand: Rename nand_get_flash_type() into nand_detect()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=7bb427990ee36482afcae859b1883e5fa1244ef2
Commit:     7bb427990ee36482afcae859b1883e5fa1244ef2
Parent:     29a198a1592d83f2bc1be3b2631b3bcf3d5b380f
Author:     Boris Brezillon <boris.brezillon at free-electrons.com>
AuthorDate: Tue May 24 20:55:33 2016 +0200
Committer:  Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Wed Mar 8 23:21:17 2017 +0100

    mtd: nand: Rename nand_get_flash_type() into nand_detect()
    
    Since commit 4722c0e958e6 ("mtd: nand: change return type of
    nand_get_flash_type() to int"), nand_get_flash_type() no longer returns
    a nand_flash_dev object.
    Rename the function to match this new behavior.
    
    Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
    Acked-by: Richard Weinberger <richard at nod.at>
---
 drivers/mtd/nand/nand_base.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 16b082f..b1eb99e 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -4050,8 +4050,7 @@ static bool find_full_id_nand(struct nand_chip *chip,
 /*
  * Get the flash and manufacturer id and lookup if the type is supported.
  */
-static int nand_get_flash_type(struct nand_chip *chip,
-			       struct nand_flash_dev *type)
+static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
 {
 	struct mtd_info *mtd = nand_to_mtd(chip);
 	int busw;
@@ -4408,7 +4407,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
 	nand_set_defaults(chip);
 
 	/* Read the flash type */
-	ret = nand_get_flash_type(chip, table);
+	ret = nand_detect(chip, table);
 	if (ret) {
 		if (!(chip->options & NAND_SCAN_SILENT_NODEV))
 			pr_warn("No NAND device found\n");