diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2004-09-30 04:35:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-30 04:35:01 -0700 |
| commit | 35dec07a8713f9c7fc2816d3713b75f6e320515f (patch) | |
| tree | 1a34977233372396c67accb65b589edf6925f9b3 /include/linux/cyclades.h | |
| parent | b5ddba69ed689125cd100c6b26692ea3717e9b6a (diff) | |
Fix cyclades driver types, and add __iomem annotations.
Remove absolutely tons of totally unnecessary casts,
once the types are done right in the first place.
The driver is still ugly as hell and needs some serious
indentation fixing, but this makes it not spew hundreds
of warnings any more.
Diffstat (limited to 'include/linux/cyclades.h')
| -rw-r--r-- | include/linux/cyclades.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index cc598507b813..46d8254c1a79 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -511,8 +511,8 @@ struct resource; struct cyclades_card { unsigned long base_phys; unsigned long ctl_phys; - unsigned long base_addr; - unsigned long ctl_addr; + void __iomem *base_addr; + void __iomem *ctl_addr; int irq; int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ int first_line; /* minor number of first channel on card */ @@ -539,9 +539,9 @@ struct cyclades_chip { * (required to support Alpha systems) * ***************************************/ -#define cy_writeb(port,val) {writeb((ucchar)(val),(ulong)(port)); mb();} -#define cy_writew(port,val) {writew((ushort)(val),(ulong)(port)); mb();} -#define cy_writel(port,val) {writel((uclong)(val),(ulong)(port)); mb();} +#define cy_writeb(port,val) {writeb((val),(port)); mb();} +#define cy_writew(port,val) {writew((val),(port)); mb();} +#define cy_writel(port,val) {writel((val),(port)); mb();} #define cy_readb(port) readb(port) #define cy_readw(port) readw(port) |