summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-01-09 11:03:43 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 11:09:07 +0100
commit6112ea0862facaeaeab504ee01c0d04bcd22daaf (patch)
tree22c2cb929cea94dd7decd0c1756e77684acdc95c /drivers/block
parent83b7bce3d390f15047e05a186bb4051536ee9dbc (diff)
downloadblackbird-op-linux-6112ea0862facaeaeab504ee01c0d04bcd22daaf.tar.gz
blackbird-op-linux-6112ea0862facaeaeab504ee01c0d04bcd22daaf.zip
zorro: ZTWO_VADDR() should return "void __iomem *"
ZTWO_VADDR() converts from physical to virtual I/O addresses, so it should return "void __iomem *" instead of "unsigned long". This allows to drop several casts, but requires adding a few casts to accomodate legacy driver frameworks that store "unsigned long" I/O addresses. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/z2ram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 5a95baf4b104..8b2a60cee3a0 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -116,8 +116,8 @@ get_z2ram( void )
if ( test_bit( i, zorro_unused_z2ram ) )
{
z2_count++;
- z2ram_map[ z2ram_size++ ] =
- ZTWO_VADDR( Z2RAM_START ) + ( i << Z2RAM_CHUNKSHIFT );
+ z2ram_map[z2ram_size++] = (unsigned long)ZTWO_VADDR(Z2RAM_START) +
+ (i << Z2RAM_CHUNKSHIFT);
clear_bit( i, zorro_unused_z2ram );
}
}
OpenPOWER on IntegriCloud