diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-09 11:03:43 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:07 +0100 |
| commit | 6112ea0862facaeaeab504ee01c0d04bcd22daaf (patch) | |
| tree | 22c2cb929cea94dd7decd0c1756e77684acdc95c /arch/m68k/include | |
| parent | 83b7bce3d390f15047e05a186bb4051536ee9dbc (diff) | |
| download | linux-6112ea0862facaeaeab504ee01c0d04bcd22daaf.tar.gz linux-6112ea0862facaeaeab504ee01c0d04bcd22daaf.tar.bz2 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 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/amigahw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/amigahw.h b/arch/m68k/include/asm/amigahw.h index 7a19b5686a4a..3bef0b2ad945 100644 --- a/arch/m68k/include/asm/amigahw.h +++ b/arch/m68k/include/asm/amigahw.h @@ -266,7 +266,7 @@ struct CIA { #define zTwoBase (0x80000000) #define ZTWO_PADDR(x) (((unsigned long)(x))-zTwoBase) -#define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) +#define ZTWO_VADDR(x) ((void __iomem *)(((unsigned long)(x))+zTwoBase)) #define CUSTOM_PHYSADDR (0xdff000) #define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR))) |