Commit 7bb42799 authored by Boris Brezillon's avatar Boris Brezillon

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

Since commit 4722c0e9 ("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: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
parent 29a198a1
...@@ -4050,8 +4050,7 @@ static bool find_full_id_nand(struct nand_chip *chip, ...@@ -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. * Get the flash and manufacturer id and lookup if the type is supported.
*/ */
static int nand_get_flash_type(struct nand_chip *chip, static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
struct nand_flash_dev *type)
{ {
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
int busw; int busw;
...@@ -4408,7 +4407,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, ...@@ -4408,7 +4407,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
nand_set_defaults(chip); nand_set_defaults(chip);
/* Read the flash type */ /* Read the flash type */
ret = nand_get_flash_type(chip, table); ret = nand_detect(chip, table);
if (ret) { 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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment