Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[karo-tx-linux.git] / drivers / spi / spi-ath79.c

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index bf1f9b32c597b502f0d1c51b7f33f64a4996fb25..6165bf21d42750af1f765f2e79bc9a9a51ea734c 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -240,14 +240,9 @@ static int ath79_spi_probe(struct platform_device *pdev)
        sp->bitbang.flags = SPI_CS_HIGH;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (r == NULL) {
-               ret = -ENOENT;
-               goto err_put_master;
-       }
-
-       sp->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
-       if (!sp->base) {
-               ret = -ENXIO;
+       sp->base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(sp->base)) {
+               ret = PTR_ERR(sp->base);
                goto err_put_master;
        }