Commit b936889c authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

[PATCH] 8390 cleanup - etherh iomem annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8c6270f9

drivers/net/arm/etherh.c

+10 −10
Original line number Diff line number Diff line
@@ -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
@@ -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:
@@ -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;
@@ -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);
@@ -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;
@@ -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;
@@ -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);