aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-09-18 21:54:49 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 00:36:59 -0400
commit8624a1c93772d24a38ed10cfcd290e8a18ac5b0a (patch)
tree035dc21e3957540c8cdb817507f2377e07065a3b
parent26d36b642e2f024019f94819284a11273807571d (diff)
[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: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/3c509.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 16817306f048..59c33925be62 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -879,11 +879,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
879 outw(skb->len, ioaddr + TX_FIFO); 879 outw(skb->len, ioaddr + TX_FIFO);
880 outw(0x00, ioaddr + TX_FIFO); 880 outw(0x00, ioaddr + TX_FIFO);
881 /* ... and the packet rounded to a doubleword. */ 881 /* ... and the packet rounded to a doubleword. */
882#ifdef __powerpc__
883 outsl_ns(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
884#else
885 outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); 882 outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
886#endif
887 883
888 dev->trans_start = jiffies; 884 dev->trans_start = jiffies;
889 if (inw(ioaddr + TX_FREE) > 1536) 885 if (inw(ioaddr + TX_FREE) > 1536)
@@ -1103,13 +1099,8 @@ el3_rx(struct net_device *dev)
1103 skb_reserve(skb, 2); /* Align IP on 16 byte */ 1099 skb_reserve(skb, 2); /* Align IP on 16 byte */
1104 1100
1105 /* 'skb->data' points to the start of sk_buff data area. */ 1101 /* 'skb->data' points to the start of sk_buff data area. */
1106#ifdef __powerpc__
1107 insl_ns(ioaddr+RX_FIFO, skb_put(skb,pkt_len),
1108 (pkt_len + 3) >> 2);
1109#else
1110 insl(ioaddr + RX_FIFO, skb_put(skb,pkt_len), 1102 insl(ioaddr + RX_FIFO, skb_put(skb,pkt_len),
1111 (pkt_len + 3) >> 2); 1103 (pkt_len + 3) >> 2);
1112#endif
1113 1104
1114 outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */ 1105 outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
1115 skb->protocol = eth_type_trans(skb,dev); 1106 skb->protocol = eth_type_trans(skb,dev);