Commit 48a7776e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Mark Brown

spi: spi-ep93xx: get platform resources early in (*probe)

Get the platform resources early in the (*probe) to minimize the number
of goto's in the error path.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 701c3587
...@@ -991,6 +991,18 @@ static int ep93xx_spi_probe(struct platform_device *pdev) ...@@ -991,6 +991,18 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
info = pdev->dev.platform_data; info = pdev->dev.platform_data;
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(&pdev->dev, "failed to get irq resources\n");
return -EBUSY;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "unable to get iomem resource\n");
return -ENODEV;
}
master = spi_alloc_master(&pdev->dev, sizeof(*espi)); master = spi_alloc_master(&pdev->dev, sizeof(*espi));
if (!master) { if (!master) {
dev_err(&pdev->dev, "failed to allocate spi master\n"); dev_err(&pdev->dev, "failed to allocate spi master\n");
...@@ -1027,20 +1039,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev) ...@@ -1027,20 +1039,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
espi->min_rate = clk_get_rate(espi->clk) / (254 * 256); espi->min_rate = clk_get_rate(espi->clk) / (254 * 256);
espi->pdev = pdev; espi->pdev = pdev;
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
error = -EBUSY;
dev_err(&pdev->dev, "failed to get irq resources\n");
goto fail_put_clock;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "unable to get iomem resource\n");
error = -ENODEV;
goto fail_put_clock;
}
espi->sspdr_phys = res->start + SSPDR; espi->sspdr_phys = res->start + SSPDR;
espi->regs_base = devm_ioremap_resource(&pdev->dev, res); espi->regs_base = devm_ioremap_resource(&pdev->dev, res);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment