]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
spi/pxa2xx: fix compile warning in pxa2xx_spi_acpi_get_pdata()
authorMika Westerberg <mika.westerberg@linux.intel.com>
Mon, 13 May 2013 10:45:09 +0000 (13:45 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 13:59:00 +0000 (17:59 +0400)
Commit cbfd6a21b6f (spi/pxa2xx: Convert to devm_ioremap_resource())
converted the driver to use devm_ioremap_resource(). However it causes
following warning to be emitted:

drivers/spi/spi-pxa2xx.c: In function ‘pxa2xx_spi_acpi_get_pdata’:
drivers/spi/spi-pxa2xx.c:1094:3: warning: return makes pointer from integer without a cast [enabled by default]

Fix this by returning NULL as it was done previously (error printing is
already done by devm_ioremap_resource()).

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/spi/spi-pxa2xx.c

index f5d84d6f8222c4afc261f738daa695da332a46df..e5d782332ca5b31350f51815eb1f601c46c03252 100644 (file)
@@ -1091,7 +1091,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
        ssp->phys_base = res->start;
        ssp->mmio_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(ssp->mmio_base))
-               return PTR_ERR(ssp->mmio_base);
+               return NULL;
 
        ssp->clk = devm_clk_get(&pdev->dev, NULL);
        ssp->irq = platform_get_irq(pdev, 0);