Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/spi/spi-ep93xx.c

+12 −14
Original line number Diff line number Diff line
@@ -991,6 +991,18 @@ static int ep93xx_spi_probe(struct platform_device *pdev) 


	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));

	if (!master) {

		dev_err(&pdev->dev, "failed to allocate spi master\n");
@@ -1027,20 +1039,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev) 
	espi->min_rate = clk_get_rate(espi->clk) / (254 * 256);

	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->regs_base = devm_ioremap_resource(&pdev->dev, res);