| From 7bb1d5b2f3a638eba39a97d6599c98f0ecb04495 Mon Sep 17 00:00:00 2001 |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Date: Mon, 13 May 2013 13:45:09 +0300 |
| Subject: spi/pxa2xx: fix compile warning in pxa2xx_spi_acpi_get_pdata() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit 6dc81f6fc0eaf0714bc6e959f8769705f41fd708) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/spi/spi-pxa2xx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-pxa2xx.c |
| +++ b/drivers/spi/spi-pxa2xx.c |
| @@ -1095,7 +1095,7 @@ pxa2xx_spi_acpi_get_pdata(struct platfor |
| 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); |