diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2013-05-13 12:45:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 15:59:00 +0200 |
| commit | 6dc81f6fc0eaf0714bc6e959f8769705f41fd708 (patch) | |
| tree | f98a4417a34f8761f862bb199d95bd1a9cfd5cbe /drivers/spi | |
| parent | Linux 3.10-rc1 (diff) | |
| download | linux-6dc81f6fc0eaf0714bc6e959f8769705f41fd708.tar.xz linux-6dc81f6fc0eaf0714bc6e959f8769705f41fd708.zip | |
spi/pxa2xx: fix compile warning in pxa2xx_spi_acpi_get_pdata()
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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index f5d84d6f8222..e5d782332ca5 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -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); |