Unverified Commit 2f3d8035 authored by Christophe Leroy's avatar Christophe Leroy Committed by Mark Brown
Browse files

spi: fsl: simplify error path in of_fsl_spi_probe() 



No need to 'goto err;' for just doing a return.
return directly from where the error happens.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Link: https://lore.kernel.org/r/2a4a7e11b37cfa0558d68f0d35e90d6da858b059.1579017697.git.christophe.leroy@c-s.fr


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc3a8b29

drivers/spi/spi-fsl-spi.c

+8 −19
Original line number Diff line number Diff line
@@ -706,8 +706,8 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) 
	struct device_node *np = ofdev->dev.of_node;

	struct spi_master *master;

	struct resource mem;

	int irq = 0, type;

	int ret = -ENOMEM;

	int irq, type;

	int ret;



	ret = of_mpc8xxx_spi_probe(ofdev);

	if (ret)
@@ -722,10 +722,8 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) 


		if (spisel_boot) {

			pinfo->immr_spi_cs = ioremap(get_immrbase() + IMMR_SPI_CS_OFFSET, 4);

			if (!pinfo->immr_spi_cs) {

				ret = -ENOMEM;

				goto err;

			}

			if (!pinfo->immr_spi_cs)

				return -ENOMEM;

		}

#endif

		/*
@@ -744,24 +742,15 @@ static int of_fsl_spi_probe(struct platform_device *ofdev) 


	ret = of_address_to_resource(np, 0, &mem);

	if (ret)

		goto err;

		return ret;



	irq = platform_get_irq(ofdev, 0);

	if (irq < 0) {

		ret = irq;

		goto err;

	}

	if (irq < 0)

		return irq;



	master = fsl_spi_probe(dev, &mem, irq);

	if (IS_ERR(master)) {

		ret = PTR_ERR(master);

		goto err;

	}



	return 0;



err:

	return ret;

	return PTR_ERR_OR_ZERO(master);

}



static int of_fsl_spi_remove(struct platform_device *ofdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE