diff options
author | Nicolas Pitre <nico@cam.org> | 2005-05-12 20:19:09 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-12 20:19:09 -0400 |
commit | eb1d6988130d5f2716ba1d53197caab0fdc31b94 (patch) | |
tree | 3e84d1d21b77d739af7bca35a0da7ef481f7e6d6 | |
parent | 53155109b6ac611d9bb4a4ef9d3109b219b8d0e1 (diff) |
[PATCH] smc91x warning fix
A few IO addr type conversions were missing.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/smc91x.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index ddd2688e7d33..c3bf0cf7cf93 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -151,7 +151,7 @@ | |||
151 | 151 | ||
152 | /* We actually can't write halfwords properly if not word aligned */ | 152 | /* We actually can't write halfwords properly if not word aligned */ |
153 | static inline void | 153 | static inline void |
154 | SMC_outw(u16 val, unsigned long ioaddr, int reg) | 154 | SMC_outw(u16 val, void __iomem *ioaddr, int reg) |
155 | { | 155 | { |
156 | if (reg & 2) { | 156 | if (reg & 2) { |
157 | unsigned int v = val << 16; | 157 | unsigned int v = val << 16; |
@@ -317,7 +317,7 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l) | |||
317 | #define SMC_insl(a, r, p, l) \ | 317 | #define SMC_insl(a, r, p, l) \ |
318 | smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l) | 318 | smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l) |
319 | static inline void | 319 | static inline void |
320 | smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma, | 320 | smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma, |
321 | u_char *buf, int len) | 321 | u_char *buf, int len) |
322 | { | 322 | { |
323 | dma_addr_t dmabuf; | 323 | dma_addr_t dmabuf; |
@@ -355,7 +355,7 @@ smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma, | |||
355 | #define SMC_insw(a, r, p, l) \ | 355 | #define SMC_insw(a, r, p, l) \ |
356 | smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l) | 356 | smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l) |
357 | static inline void | 357 | static inline void |
358 | smc_pxa_dma_insw(u_long ioaddr, u_long physaddr, int reg, int dma, | 358 | smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma, |
359 | u_char *buf, int len) | 359 | u_char *buf, int len) |
360 | { | 360 | { |
361 | dma_addr_t dmabuf; | 361 | dma_addr_t dmabuf; |