OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin SPI driver: use void __iomem * for regs_base 

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bryan Wu 2007-12-04 23:45:22 -08:00 committed by Linus Torvalds
parent d8c05008b0
commit f452126c2e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/spi/spi_bfin5xx.c
View File

@ -78,7 +78,7 @@ struct driver_data {
struct spi_master *master;
/* Regs base of SPI controller */
u32 regs_base;
void __iomem *regs_base;
/* BFIN hookup */
struct bfin5xx_spi_master *master_info;
@ -1311,9 +1311,8 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
goto out_error_get_res;
}
drv_data->regs_base = (u32) ioremap(res->start,
(res->end - res->start + 1));
if (!drv_data->regs_base) {
drv_data->regs_base = ioremap(res->start, (res->end - res->start + 1));
if (drv_data->regs_base == NULL) {
dev_err(dev, "Cannot map IO\n");
status = -ENXIO;
goto out_error_ioremap;
@ -1352,7 +1351,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
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_data->dma_channel);
return status;