3 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index ff32befd8443..b6162fe2348e 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,
 
         if ((i = pci_request_regions(pdev,"3c359"))) { 
                 return i ; 
-        } ; 
+        }
 
         /* 
          * Allowing init_trdev to allocate the private data will align
@@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev)
         if (readb(xl_mmio + MMIO_MACDATA) != 0) {  /* Misr not clear */
                 for (i=0; i<6; i++) { 
                         writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        while (readb(xl_mmio + MMIO_MACDATA) != 0 ) {} ; /* Empty Loop */
+                        while (readb(xl_mmio + MMIO_MACDATA) != 0) {
+                                ;       /* Empty Loop */
+                        }
                 } 
         }
 
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 4786497de03e..e257a00fe14b 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -123,6 +123,7 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */
 /* some 95 OS send many non UI frame; this allow removing the warning */
 #define TR_FILTERNONUI  1
 
+#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/ip.h>
@@ -177,7 +178,7 @@ static char __devinit *adapter_def(char type)
         case 0xD: return "16/4 Adapter/A (short) | 16/4 ISA-16 Adapter";
         case 0xC: return "Auto 16/4 Adapter";
         default: return "adapter (unknown type)";
-        };
+        }
 };
 
 #define TRC_INIT 0x01           /*  Trace initialization & PROBEs */
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 2bedc0ace812..6153cfd696b6 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -418,7 +418,7 @@ static irqreturn_t madgemc_interrupt(int irq, void *dev_id)
                 return IRQ_NONE;
         }
 
-        dev = (struct net_device *)dev_id;
+        dev = dev_id;
 
         /* Make sure its really us. -- the Madge way */
         pending = inb(dev->base_addr + MC_CONTROL_REG0);