vserver 2.0 rc7

[linux-2.6.git] / drivers / net / arcnet / arcnet.c

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index fdd83f1..4f9f69e 100644 (file)
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(arcnet_dump_skb);
 void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc,
                        int take_arcnet_lock)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int i, length;
        unsigned long flags = 0;
        static uint8_t buf[512];
@@ -244,7 +244,7 @@ void arcnet_unregister_proto(struct ArcProto *proto)
  */
 static void release_arcbuf(struct net_device *dev, int bufnum)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int i;
 
        lp->buf_queue[lp->first_free_buf++] = bufnum;
@@ -253,7 +253,7 @@ static void release_arcbuf(struct net_device *dev, int bufnum)
        BUGLVL(D_DURING) {
                BUGMSG(D_DURING, "release_arcbuf: freed #%d; buffer queue is now: ",
                       bufnum);
-               for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5)
+               for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5)
                        BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]);
                BUGMSG2(D_DURING, "\n");
        }
@@ -266,7 +266,7 @@ static void release_arcbuf(struct net_device *dev, int bufnum)
  */
 static int get_arcbuf(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int buf = -1, i;
 
        if (!atomic_dec_and_test(&lp->buf_lock)) {
@@ -289,7 +289,7 @@ static int get_arcbuf(struct net_device *dev)
 
        BUGLVL(D_DURING) {
                BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf);
-               for (i = lp->next_buf; i != lp->first_free_buf; i = ++i % 5)
+               for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5)
                        BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]);
                BUGMSG2(D_DURING, "\n");
        }
@@ -367,7 +367,7 @@ struct net_device *alloc_arcdev(char *name)
  */
 static int arcnet_open(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int count, newmtu, error;
 
        BUGMSG(D_INIT,"opened.");
@@ -467,7 +467,7 @@ static int arcnet_open(struct net_device *dev)
 /* The inverse routine to arcnet_open - shuts down the card. */
 static int arcnet_close(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
 
        netif_stop_queue(dev);
 
@@ -488,7 +488,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
                         unsigned short type, void *daddr, void *saddr,
                         unsigned len)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        uint8_t _daddr, proto_num;
        struct ArcProto *proto;
 
@@ -546,7 +546,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
 static int arcnet_rebuild_header(struct sk_buff *skb)
 {
        struct net_device *dev = skb->dev;
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int status = 0;         /* default is failure */
        unsigned short type;
        uint8_t daddr=0;
@@ -591,7 +591,7 @@ static int arcnet_rebuild_header(struct sk_buff *skb)
 /* Called by the kernel in order to transmit a packet. */
 static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        struct archdr *pkt;
        struct arc_rfc1201 *soft;
        struct ArcProto *proto;
@@ -674,7 +674,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
  */
 static int go_tx(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
 
        BUGMSG(D_DURING, "go_tx: status=%Xh, intmask=%Xh, next_tx=%d, cur_tx=%d\n",
               ASTATUS(), lp->intmask, lp->next_tx, lp->cur_tx);
@@ -705,7 +705,7 @@ static int go_tx(struct net_device *dev)
 static void arcnet_timeout(struct net_device *dev)
 {
        unsigned long flags;
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        int status = ASTATUS();
        char *msg;
 
@@ -754,7 +754,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
        BUGMSG(D_DURING, "in arcnet_interrupt\n");
        
-       lp = (struct arcnet_local *) dev->priv;
+       lp = dev->priv;
        if (!lp)
                BUG();
                
@@ -989,7 +989,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  */
 void arcnet_rx(struct net_device *dev, int bufnum)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        struct archdr pkt;
        struct arc_rfc1201 *soft;
        int length, ofs;
@@ -1053,7 +1053,7 @@ void arcnet_rx(struct net_device *dev, int bufnum)
  */
 static struct net_device_stats *arcnet_get_stats(struct net_device *dev)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        return &lp->stats;
 }
 
@@ -1070,7 +1070,7 @@ static void null_rx(struct net_device *dev, int bufnum,
 static int null_build_header(struct sk_buff *skb, struct net_device *dev,
                             unsigned short type, uint8_t daddr)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
 
        BUGMSG(D_PROTO,
               "tx: can't build header for encap %02Xh; load a protocol driver.\n",
@@ -1085,7 +1085,7 @@ static int null_build_header(struct sk_buff *skb, struct net_device *dev,
 static int null_prepare_tx(struct net_device *dev, struct archdr *pkt,
                           int length, int bufnum)
 {
-       struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+       struct arcnet_local *lp = dev->priv;
        struct arc_hardware newpkt;
 
        BUGMSG(D_PROTO, "tx: no encap for this host; load a protocol driver.\n");