提交 f452126c 编写于 作者: B Bryan Wu 提交者: Linus Torvalds

Blackfin SPI driver: use void __iomem * for regs_base

Signed-off-by: NBryan Wu <bryan.wu@analog.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 d8c05008
...@@ -78,7 +78,7 @@ struct driver_data { ...@@ -78,7 +78,7 @@ struct driver_data {
struct spi_master *master; struct spi_master *master;
/* Regs base of SPI controller */ /* Regs base of SPI controller */
u32 regs_base; void __iomem *regs_base;
/* BFIN hookup */ /* BFIN hookup */
struct bfin5xx_spi_master *master_info; struct bfin5xx_spi_master *master_info;
...@@ -1311,9 +1311,8 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) ...@@ -1311,9 +1311,8 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
goto out_error_get_res; goto out_error_get_res;
} }
drv_data->regs_base = (u32) ioremap(res->start, drv_data->regs_base = ioremap(res->start, (res->end - res->start + 1));
(res->end - res->start + 1)); if (drv_data->regs_base == NULL) {
if (!drv_data->regs_base) {
dev_err(dev, "Cannot map IO\n"); dev_err(dev, "Cannot map IO\n");
status = -ENXIO; status = -ENXIO;
goto out_error_ioremap; goto out_error_ioremap;
...@@ -1352,7 +1351,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) ...@@ -1352,7 +1351,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
goto out_error; goto out_error;
} }
dev_info(dev, "%s, Version %s, regs_base@0x%08x, dma channel@%d\n", dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n",
DRV_DESC, DRV_VERSION, drv_data->regs_base, DRV_DESC, DRV_VERSION, drv_data->regs_base,
drv_data->dma_channel); drv_data->dma_channel);
return status; return status;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册