Commit 35dec07a authored by Linus Torvalds's avatar Linus Torvalds Committed by Linus Torvalds

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.
parent b5ddba69
This diff is collapsed.
...@@ -511,8 +511,8 @@ struct resource; ...@@ -511,8 +511,8 @@ struct resource;
struct cyclades_card { struct cyclades_card {
unsigned long base_phys; unsigned long base_phys;
unsigned long ctl_phys; unsigned long ctl_phys;
unsigned long base_addr; void __iomem *base_addr;
unsigned long ctl_addr; void __iomem *ctl_addr;
int irq; int irq;
int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */
int first_line; /* minor number of first channel on card */ int first_line; /* minor number of first channel on card */
...@@ -539,9 +539,9 @@ struct cyclades_chip { ...@@ -539,9 +539,9 @@ struct cyclades_chip {
* (required to support Alpha systems) * * (required to support Alpha systems) *
***************************************/ ***************************************/
#define cy_writeb(port,val) {writeb((ucchar)(val),(ulong)(port)); mb();} #define cy_writeb(port,val) {writeb((val),(port)); mb();}
#define cy_writew(port,val) {writew((ushort)(val),(ulong)(port)); mb();} #define cy_writew(port,val) {writew((val),(port)); mb();}
#define cy_writel(port,val) {writel((uclong)(val),(ulong)(port)); mb();} #define cy_writel(port,val) {writel((val),(port)); mb();}
#define cy_readb(port) readb(port) #define cy_readb(port) readb(port)
#define cy_readw(port) readw(port) #define cy_readw(port) readw(port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment