Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bbc3c08 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: ams-delta: cleanup ams_delta_init() error path 



Remove unused labels, rename out_mtd into err_unmap to make it clearer
and return 0 instead of using a goto out at the end of the registration
procedure.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Tested-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent d54445d6

drivers/mtd/nand/raw/ams-delta.c

+12 −14
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static int ams_delta_init(struct platform_device *pdev) 
	io_base = ioremap(res->start, resource_size(res));

	if (!io_base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		err = -EIO;

		goto out_free;

		return -EIO;

	}



	priv->io_base = io_base;
@@ -224,7 +223,7 @@ static int ams_delta_init(struct platform_device *pdev) 
	if (IS_ERR(priv->gpiod_rdy)) {

		err = PTR_ERR(priv->gpiod_rdy);

		dev_warn(&pdev->dev, "RDY GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	this->ecc.mode = NAND_ECC_SOFT;
@@ -237,42 +236,42 @@ static int ams_delta_init(struct platform_device *pdev) 
	if (IS_ERR(priv->gpiod_nwp)) {

		err = PTR_ERR(priv->gpiod_nwp);

		dev_err(&pdev->dev, "NWP GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	priv->gpiod_nce = devm_gpiod_get(&pdev->dev, "nce", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_nce)) {

		err = PTR_ERR(priv->gpiod_nce);

		dev_err(&pdev->dev, "NCE GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	priv->gpiod_nre = devm_gpiod_get(&pdev->dev, "nre", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_nre)) {

		err = PTR_ERR(priv->gpiod_nre);

		dev_err(&pdev->dev, "NRE GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	priv->gpiod_nwe = devm_gpiod_get(&pdev->dev, "nwe", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->gpiod_nwe)) {

		err = PTR_ERR(priv->gpiod_nwe);

		dev_err(&pdev->dev, "NWE GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	priv->gpiod_ale = devm_gpiod_get(&pdev->dev, "ale", GPIOD_OUT_LOW);

	if (IS_ERR(priv->gpiod_ale)) {

		err = PTR_ERR(priv->gpiod_ale);

		dev_err(&pdev->dev, "ALE GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	priv->gpiod_cle = devm_gpiod_get(&pdev->dev, "cle", GPIOD_OUT_LOW);

	if (IS_ERR(priv->gpiod_cle)) {

		err = PTR_ERR(priv->gpiod_cle);

		dev_err(&pdev->dev, "CLE GPIO request failed (%d)\n", err);

		goto out_mtd;

		goto err_unmap;

	}



	/* Initialize data port direction to a known state */
@@ -281,17 +280,16 @@ static int ams_delta_init(struct platform_device *pdev) 
	/* Scan to find existence of the device */

	err = nand_scan(this, 1);

	if (err)

		goto out_mtd;

		goto err_unmap;



	/* Register the partitions */

	mtd_device_register(mtd, partition_info, ARRAY_SIZE(partition_info));



	goto out;

	return 0;



 out_mtd:

err_unmap:

	iounmap(io_base);

out_free:

 out:



	return err;

}