Skip to content

Commit

Permalink
[PATCH] Remove powerpc specific parts of 3c509 driver
Browse files Browse the repository at this point in the history
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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Stephen Rothwell authored and Jeff Garzik committed Sep 19, 2006
1 parent 26d36b6 commit 8624a1c
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions drivers/net/3c509.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 8624a1c

Please sign in to comment.