Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8624a1c9 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jeff Garzik
Browse files

[PATCH] Remove powerpc specific parts of 3c509 driver 



On powerpc and ppc, insl_ns and insl are identical as are outsl_ns and
outsl, so remove the conditional use of insl_ns and outsl_ns.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 26d36b64

drivers/net/3c509.c

+0 −9
Original line number Diff line number Diff line
@@ -879,11 +879,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	outw(skb->len, ioaddr + TX_FIFO);

	outw(0x00, ioaddr + TX_FIFO);

	/* ... and the packet rounded to a doubleword. */

#ifdef  __powerpc__

	outsl_ns(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);

#else

	outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);

#endif



	dev->trans_start = jiffies;

	if (inw(ioaddr + TX_FREE) > 1536)
@@ -1103,13 +1099,8 @@ el3_rx(struct net_device *dev) 
				skb_reserve(skb, 2);     /* Align IP on 16 byte */



				/* 'skb->data' points to the start of sk_buff data area. */

#ifdef  __powerpc__

				insl_ns(ioaddr+RX_FIFO, skb_put(skb,pkt_len),

							   (pkt_len + 3) >> 2);

#else

				insl(ioaddr + RX_FIFO, skb_put(skb,pkt_len),

					 (pkt_len + 3) >> 2);

#endif



				outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */

				skb->protocol = eth_type_trans(skb,dev);