summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-bfin-v3.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:48:56 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:48:56 +0100
commit4faad26c275c86b8bd270cd77beafc6355879f18 (patch)
treeb44440db1fb3b9e69b3e903cf7af256f2287c1cd /drivers/spi/spi-bfin-v3.c
parent8e37befc5ce80d6c9f3072e63d6f665ee2999783 (diff)
parentde0fa83c410d8ad4bcee72814562eb1be7551edf (diff)
Merge remote-tracking branch 'spi/topic/ioremap' into spi-next
Diffstat (limited to 'drivers/spi/spi-bfin-v3.c')
-rw-r--r--drivers/spi/spi-bfin-v3.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c
index 914f9fe1ec9..e4394ebf08f 100644
--- a/drivers/spi/spi-bfin-v3.c
+++ b/drivers/spi/spi-bfin-v3.c
@@ -792,13 +792,6 @@ static int bfin_spi_probe(struct platform_device *pdev)
return -ENXIO;
}
- /* get register base and tx/rx dma */
- mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!mem) {
- dev_err(dev, "can not get register base\n");
- return -ENXIO;
- }
-
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!res) {
dev_err(dev, "can not get tx dma resource\n");
@@ -838,6 +831,7 @@ static int bfin_spi_probe(struct platform_device *pdev)
drv_data->pin_req = info->pin_req;
drv_data->sclk = sclk;
+ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
drv_data->regs = devm_ioremap_resource(dev, mem);
if (IS_ERR(drv_data->regs)) {
ret = PTR_ERR(drv_data->regs);