crypto: qat - make qat_asym_algs.o depend on asn1 headers

[cascardo/linux.git] / drivers / spi / spi-octeon.c

diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 07e4ce8..3b17009 100644 (file)
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -175,6 +175,7 @@ err:
 static int octeon_spi_probe(struct platform_device *pdev)
 {
        struct resource *res_mem;
+       void __iomem *reg_base;
        struct spi_master *master;
        struct octeon_spi *p;
        int err = -ENOENT;
@@ -186,19 +187,13 @@ static int octeon_spi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, master);
 
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-       if (res_mem == NULL) {
-               dev_err(&pdev->dev, "found no memory resource\n");
-               err = -ENXIO;
-               goto fail;
-       }
-       if (!devm_request_mem_region(&pdev->dev, res_mem->start,
-                                    resource_size(res_mem), res_mem->name)) {
-               dev_err(&pdev->dev, "request_mem_region failed\n");
+       reg_base = devm_ioremap_resource(&pdev->dev, res_mem);
+       if (IS_ERR(reg_base)) {
+               err = PTR_ERR(reg_base);
                goto fail;
        }
-       p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,
-                                            resource_size(res_mem));
+
+       p->register_base = (u64)reg_base;
 
        master->num_chipselect = 4;
        master->mode_bits = SPI_CPHA |