Skip to content

Commit

Permalink
spi: fsl-espi: simplify of_fsl_espi_probe
Browse files Browse the repository at this point in the history
Simplify of_fsl_espi_probe.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Heiner Kallweit authored and Mark Brown committed Sep 24, 2016
1 parent fb8ac91 commit acf6921
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions drivers/spi/spi-fsl-espi.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,36 +685,29 @@ 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)
return ret;

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)
Expand Down

0 comments on commit acf6921

Please sign in to comment.