[PATCH] mtd: nand: docg4: simplify error case
Boris Brezillon
boris.brezillon at free-electrons.com
Fri Dec 18 12:24:30 PST 2015
On Fri, 18 Dec 2015 11:39:53 -0800
Brian Norris <computersforpeace at gmail.com> wrote:
> 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 at gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon at free-electrons.com>
> ---
> drivers/mtd/nand/docg4.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
> index cb6efadd712e..24d478d90dcc 100644
> --- 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);
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
More information about the linux-mtd
mailing list