mtd: nand: docg4: simplify error case

Other refactorings have left the 'fail' label much simpler, so it
shouldn't have to handle the failed allocation case.

This also fixes a -Wshadow warning.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index cb6efadd712ebbc63b250a732fe8501258da618b..24d478d90dcc046fb4e9cc1aaddb81d9025ad9e3 100644 (file)
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -1353,14 +1353,10 @@ static int __init probe_docg4(struct platform_device *pdev)
        doc->mtd = mtd;
        return 0;
 
- fail:
-       if (nand) {
-               /* re-declarations avoid compiler warning */
-               struct docg4_priv *doc = nand->priv;
-               nand_release(mtd); /* deletes partitions and mtd devices */
-               free_bch(doc->bch);
-               kfree(nand);
-       }
+fail:
+       nand_release(mtd); /* deletes partitions and mtd devices */
+       free_bch(doc->bch);
+       kfree(nand);
 
 fail_unmap:
        iounmap(virtadr);