Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 41459
b: refs/heads/master
c: b936889
h: refs/heads/master
i:
  41457: 969e1d3
  41455: 72e4e11
v: v3
  • Loading branch information
Al Viro authored and Jeff Garzik committed Dec 2, 2006
1 parent 9be5f13 commit 930c4b8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c6270f957f0eaa343e4a609159c4b85038468d6
refs/heads/master: b936889c8f95b601d3ef6caac6ac653a8adb4fec
20 changes: 10 additions & 10 deletions trunk/drivers/net/arm/etherh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@

#define EI_SHIFT(x) (ei_local->reg_offset[x])

#define ei_inb(_p) readb(_p)
#define ei_outb(_v,_p) writeb(_v,_p)
#define ei_inb_p(_p) readb(_p)
#define ei_outb_p(_v,_p) writeb(_v,_p)
#define ei_inb(_p) readb((void __iomem *)_p)
#define ei_outb(_v,_p) writeb(_v,(void __iomem *)_p)
#define ei_inb_p(_p) readb((void __iomem *)_p)
#define ei_outb_p(_v,_p) writeb(_v,(void __iomem *)_p)

#define NET_DEBUG 0
#define DEBUG_INIT 2
Expand Down Expand Up @@ -184,7 +184,7 @@ etherh_setif(struct net_device *dev)
switch (etherh_priv(dev)->id) {
case PROD_I3_ETHERLAN600:
case PROD_I3_ETHERLAN600A:
addr = (void *)dev->base_addr + EN0_RCNTHI;
addr = (void __iomem *)dev->base_addr + EN0_RCNTHI;

switch (dev->if_port) {
case IF_PORT_10BASE2:
Expand Down Expand Up @@ -225,7 +225,7 @@ etherh_getifstat(struct net_device *dev)
switch (etherh_priv(dev)->id) {
case PROD_I3_ETHERLAN600:
case PROD_I3_ETHERLAN600A:
addr = (void *)dev->base_addr + EN0_RCNTHI;
addr = (void __iomem *)dev->base_addr + EN0_RCNTHI;
switch (dev->if_port) {
case IF_PORT_10BASE2:
stat = 1;
Expand Down Expand Up @@ -288,7 +288,7 @@ static void
etherh_reset(struct net_device *dev)
{
struct ei_device *ei_local = netdev_priv(dev);
void __iomem *addr = (void *)dev->base_addr;
void __iomem *addr = (void __iomem *)dev->base_addr;

writeb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr);

Expand Down Expand Up @@ -334,7 +334,7 @@ etherh_block_output (struct net_device *dev, int count, const unsigned char *buf

ei_local->dmaing = 1;

addr = (void *)dev->base_addr;
addr = (void __iomem *)dev->base_addr;
dma_base = etherh_priv(dev)->dma_base;

count = (count + 1) & ~1;
Expand Down Expand Up @@ -394,7 +394,7 @@ etherh_block_input (struct net_device *dev, int count, struct sk_buff *skb, int

ei_local->dmaing = 1;

addr = (void *)dev->base_addr;
addr = (void __iomem *)dev->base_addr;
dma_base = etherh_priv(dev)->dma_base;

buf = skb->data;
Expand Down Expand Up @@ -434,7 +434,7 @@ etherh_get_header (struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_p

ei_local->dmaing = 1;

addr = (void *)dev->base_addr;
addr = (void __iomem *)dev->base_addr;
dma_base = etherh_priv(dev)->dma_base;

writeb (E8390_NODMA | E8390_PAGE0 | E8390_START, addr + E8390_CMD);
Expand Down

0 comments on commit 930c4b8

Please sign in to comment.