summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorHeiner Kallweit <heiner.kallweit@web.de>2016-09-17 15:43:00 +0200
committerMark Brown <broonie@kernel.org>2016-09-24 19:48:31 +0100
commitacf692190f972ee2ed6578f30278f21c244d6148 (patch)
treedaa44b12f441f7cf7c2a5dc34d01812ed58804d2 /drivers/spi
parentfb8ac912df93ea4edc549992d7c9d173e5413164 (diff)
downloadlinux-acf692190f972ee2ed6578f30278f21c244d6148.tar.bz2
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-espi.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 4f9d9ec6880a..dee3f822cea8 100644
--- 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)