]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mtd: rawnand: nandsim: Fix the label pointing on nand_cleanup()
authorMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 25 May 2020 08:58:48 +0000 (10:58 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Sun, 31 May 2020 08:53:38 +0000 (10:53 +0200)
Drop the generic err_exit.

The remaining operation to do from this goto statement is to cleanup
the NAND allocations, so rename it.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200525085851.17682-15-miquel.raynal@bootlin.com
drivers/mtd/nand/raw/nandsim.c

index 8511e70ca1e9295ed90fa35b80b0b87c74b301ee..8ffd68321175f42205b5f72407ebe5b666c73cb2 100644 (file)
@@ -2366,7 +2366,7 @@ static int __init ns_init_module(void)
                if (new_size >> overridesize != nsmtd->erasesize) {
                        NS_ERR("overridesize is too big\n");
                        ret = -EINVAL;
-                       goto err_exit;
+                       goto cleanup_nand;
                }
 
                /* N.B. This relies on nand_scan not doing anything with the size before we change it */
@@ -2379,7 +2379,7 @@ static int __init ns_init_module(void)
 
        ret = ns_setup_wear_reporting(nsmtd);
        if (ret)
-               goto err_exit;
+               goto cleanup_nand;
 
        ret = ns_init(nsmtd);
        if (ret)
@@ -2406,11 +2406,11 @@ static int __init ns_init_module(void)
 
 unregister_mtd:
        WARN_ON(mtd_device_unregister(nsmtd));
-err_exit:
 free_ns_object:
        ns_free(ns);
 free_ebw:
        kfree(erase_block_wear);
+cleanup_nand:
        nand_cleanup(chip);
 error:
        kfree(ns);