diff options
Diffstat (limited to 'drivers/net/arm')
-rw-r--r-- | drivers/net/arm/etherh.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index 747a71f5dd0e..f3faa4fe58e7 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c | |||
@@ -54,10 +54,10 @@ | |||
54 | 54 | ||
55 | #define EI_SHIFT(x) (ei_local->reg_offset[x]) | 55 | #define EI_SHIFT(x) (ei_local->reg_offset[x]) |
56 | 56 | ||
57 | #define ei_inb(_p) readb(_p) | 57 | #define ei_inb(_p) readb((void __iomem *)_p) |
58 | #define ei_outb(_v,_p) writeb(_v,_p) | 58 | #define ei_outb(_v,_p) writeb(_v,(void __iomem *)_p) |
59 | #define ei_inb_p(_p) readb(_p) | 59 | #define ei_inb_p(_p) readb((void __iomem *)_p) |
60 | #define ei_outb_p(_v,_p) writeb(_v,_p) | 60 | #define ei_outb_p(_v,_p) writeb(_v,(void __iomem *)_p) |
61 | 61 | ||
62 | #define NET_DEBUG 0 | 62 | #define NET_DEBUG 0 |
63 | #define DEBUG_INIT 2 | 63 | #define DEBUG_INIT 2 |
@@ -184,7 +184,7 @@ etherh_setif(struct net_device *dev) | |||
184 | switch (etherh_priv(dev)->id) { | 184 | switch (etherh_priv(dev)->id) { |
185 | case PROD_I3_ETHERLAN600: | 185 | case PROD_I3_ETHERLAN600: |
186 | case PROD_I3_ETHERLAN600A: | 186 | case PROD_I3_ETHERLAN600A: |
187 | addr = (void *)dev->base_addr + EN0_RCNTHI; | 187 | addr = (void __iomem *)dev->base_addr + EN0_RCNTHI; |
188 | 188 | ||
189 | switch (dev->if_port) { | 189 | switch (dev->if_port) { |
190 | case IF_PORT_10BASE2: | 190 | case IF_PORT_10BASE2: |
@@ -225,7 +225,7 @@ etherh_getifstat(struct net_device *dev) | |||
225 | switch (etherh_priv(dev)->id) { | 225 | switch (etherh_priv(dev)->id) { |
226 | case PROD_I3_ETHERLAN600: | 226 | case PROD_I3_ETHERLAN600: |
227 | case PROD_I3_ETHERLAN600A: | 227 | case PROD_I3_ETHERLAN600A: |
228 | addr = (void *)dev->base_addr + EN0_RCNTHI; | 228 | addr = (void __iomem *)dev->base_addr + EN0_RCNTHI; |
229 | switch (dev->if_port) { | 229 | switch (dev->if_port) { |
230 | case IF_PORT_10BASE2: | 230 | case IF_PORT_10BASE2: |
231 | stat = 1; | 231 | stat = 1; |
@@ -288,7 +288,7 @@ static void | |||
288 | etherh_reset(struct net_device *dev) | 288 | etherh_reset(struct net_device *dev) |
289 | { | 289 | { |
290 | struct ei_device *ei_local = netdev_priv(dev); | 290 | struct ei_device *ei_local = netdev_priv(dev); |
291 | void __iomem *addr = (void *)dev->base_addr; | 291 | void __iomem *addr = (void __iomem *)dev->base_addr; |
292 | 292 | ||
293 | writeb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr); | 293 | writeb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr); |
294 | 294 | ||
@@ -334,7 +334,7 @@ etherh_block_output (struct net_device *dev, int count, const unsigned char *buf | |||
334 | 334 | ||
335 | ei_local->dmaing = 1; | 335 | ei_local->dmaing = 1; |
336 | 336 | ||
337 | addr = (void *)dev->base_addr; | 337 | addr = (void __iomem *)dev->base_addr; |
338 | dma_base = etherh_priv(dev)->dma_base; | 338 | dma_base = etherh_priv(dev)->dma_base; |
339 | 339 | ||
340 | count = (count + 1) & ~1; | 340 | count = (count + 1) & ~1; |
@@ -394,7 +394,7 @@ etherh_block_input (struct net_device *dev, int count, struct sk_buff *skb, int | |||
394 | 394 | ||
395 | ei_local->dmaing = 1; | 395 | ei_local->dmaing = 1; |
396 | 396 | ||
397 | addr = (void *)dev->base_addr; | 397 | addr = (void __iomem *)dev->base_addr; |
398 | dma_base = etherh_priv(dev)->dma_base; | 398 | dma_base = etherh_priv(dev)->dma_base; |
399 | 399 | ||
400 | buf = skb->data; | 400 | buf = skb->data; |
@@ -434,7 +434,7 @@ etherh_get_header (struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_p | |||
434 | 434 | ||
435 | ei_local->dmaing = 1; | 435 | ei_local->dmaing = 1; |
436 | 436 | ||
437 | addr = (void *)dev->base_addr; | 437 | addr = (void __iomem *)dev->base_addr; |
438 | dma_base = etherh_priv(dev)->dma_base; | 438 | dma_base = etherh_priv(dev)->dma_base; |
439 | 439 | ||
440 | writeb (E8390_NODMA | E8390_PAGE0 | E8390_START, addr + E8390_CMD); | 440 | writeb (E8390_NODMA | E8390_PAGE0 | E8390_START, addr + E8390_CMD); |