spi: fsl-espi: simplify of_fsl_espi_probe

Simplify of_fsl_espi_probe.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 4f9d9ec6880a0eb9b829bc53d03fcef30db0a3af..dee3f822cea8ec423924aaf40e18aa149dee52d4 100644 (file)
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -685,7 +685,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
        struct spi_master *master;
        struct resource mem;
        unsigned int irq;
-       int ret = -ENOMEM;
+       int ret;
 
        ret = of_mpc8xxx_spi_probe(ofdev);
        if (ret)
@@ -693,28 +693,21 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
 
        ret = of_fsl_espi_get_chipselects(dev);
        if (ret)
-               goto err;
+               return ret;
 
        ret = of_address_to_resource(np, 0, &mem);
        if (ret)
-               goto err;
+               return ret;
 
        irq = irq_of_parse_and_map(np, 0);
-       if (!irq) {
-               ret = -EINVAL;
-               goto err;
-       }
+       if (!irq)
+               return -EINVAL;
 
        master = fsl_espi_probe(dev, &mem, irq);
-       if (IS_ERR(master)) {
-               ret = PTR_ERR(master);
-               goto err;
-       }
+       if (IS_ERR(master))
+               return PTR_ERR(master);
 
        return 0;
-
-err:
-       return ret;
 }
 
 static int of_fsl_espi_remove(struct platform_device *dev)