diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:13 +0100 |
| commit | e7c57cc12442954065de608ca450bf75b9ed900e (patch) | |
| tree | 603b7a95c702e3fbd583f876f65123141da7b0c9 | |
| parent | a3e412dcf568cc389a584cd37ccb0057a89dcb0a (diff) | |
| parent | 5f7f54b5cafcba7c20f8888c1d7acfa21bfca20b (diff) | |
| download | op-kernel-dev-e7c57cc12442954065de608ca450bf75b9ed900e.zip op-kernel-dev-e7c57cc12442954065de608ca450bf75b9ed900e.tar.gz | |
Merge remote-tracking branch 'spi/topic/tegra' into spi-next
| -rw-r--r-- | drivers/spi/spi-tegra114.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index c14e30c..145dd43 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -1051,18 +1051,12 @@ static int tegra_spi_probe(struct platform_device *pdev) spin_lock_init(&tspi->lock); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r) { - dev_err(&pdev->dev, "No IO memory resource\n"); - ret = -ENODEV; - goto exit_free_master; - } - tspi->phys = r->start; tspi->base = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(tspi->base)) { ret = PTR_ERR(tspi->base); - dev_err(&pdev->dev, "ioremap failed: err = %d\n", ret); goto exit_free_master; } + tspi->phys = r->start; spi_irq = platform_get_irq(pdev, 0); tspi->irq = spi_irq; |
