]> err.no Git - linux-2.6/commitdiff
Blackfin SPI driver: use void __iomem * for regs_base
authorBryan Wu <bryan.wu@analog.com>
Wed, 5 Dec 2007 07:45:22 +0000 (23:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 5 Dec 2007 17:21:20 +0000 (09:21 -0800)
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>
drivers/spi/spi_bfin5xx.c

index 0e33b5aa35fb1404f3fba6410323a3d992122b82..6a02bd3ef9fd27859782384d1715d6d8d6367092 100644 (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;