mtd: rawnand: jz4740: group nand_scan_{ident, tail} calls

Prepare the migration to nand_scan() by moving both calls to
nand_scan_ident() and nand_scan_tail() in a single spot.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>

diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c
index 3abf874..ccd8f89 100644 (file)
--- a/drivers/mtd/nand/raw/jz4740_nand.c
+++ b/drivers/mtd/nand/raw/jz4740_nand.c
@@ -309,6 +309,7 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
                               size_t chipnr, uint8_t *nand_maf_id,
                               uint8_t *nand_dev_id)
 {
+       struct jz_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int ret;
        char res_name[6];
        uint32_t ctrl;
@@ -335,6 +336,16 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
                if (ret)
                        goto notfound_id;
 
+               if (pdata && pdata->ident_callback)
+                       pdata->ident_callback(pdev, mtd, &pdata->partitions,
+                                             &pdata->num_partitions);
+
+               ret = nand_scan_tail(mtd);
+               if (ret) {
+                       dev_err(&pdev->dev,  "Failed to scan NAND\n");
+                       goto notfound_id;
+               }
+
                /* Retrieve the IDs from the first chip. */
                chip->select_chip(mtd, 0);
                nand_reset_op(chip);
@@ -456,17 +467,6 @@ static int jz_nand_probe(struct platform_device *pdev)
                goto err_iounmap_mmio;
        }
 
-       if (pdata && pdata->ident_callback) {
-               pdata->ident_callback(pdev, mtd, &pdata->partitions,
-                                       &pdata->num_partitions);
-       }
-
-       ret = nand_scan_tail(mtd);
-       if (ret) {
-               dev_err(&pdev->dev,  "Failed to scan NAND\n");
-               goto err_unclaim_banks;
-       }
-
        ret = mtd_device_register(mtd, pdata ? pdata->partitions : NULL,
                                  pdata ? pdata->num_partitions : 0);
 
@@ -481,7 +481,6 @@ static int jz_nand_probe(struct platform_device *pdev)
 
 err_cleanup_nand:
        nand_cleanup(chip);
-err_unclaim_banks:
        while (chipnr--) {
                unsigned char bank = nand->banks[chipnr];
                jz_nand_iounmap_resource(nand->bank_mem[bank - 1],