Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

25 files changed, 156 insertions, 165 deletions

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d08ce6a264cb..423eb26386c8 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -409,7 +409,7 @@ config CYCLADES_SYNC
         tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"
         depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
         ---help---
-          Cyclom 2X from Cyclades Corporation <http://www.cyclades.com/> is an
+          Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an
           intelligent multiprotocol WAN adapter with data transfer rates up to
           512 Kbps. These cards support the X.25 and SNA related protocols.
 
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 0bd898c94759..4ac85a09c5a6 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -264,7 +264,7 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                     new_line.clock_type != CLOCK_TXFROMRX &&
                     new_line.clock_type != CLOCK_INT &&
                     new_line.clock_type != CLOCK_TXINT)
-                return -EINVAL; /* No such clock setting */
+                        return -EINVAL; /* No such clock setting */
 
                 if (new_line.loopback != 0 && new_line.loopback != 1)
                         return -EINVAL;
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 04c6cd4333f1..6fb6f8e667d0 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -329,7 +329,7 @@ static int startmicrocode(struct cosa_data *cosa, int address);
 static int readmem(struct cosa_data *cosa, char __user *data, int addr, int len);
 static int cosa_reset_and_read_id(struct cosa_data *cosa, char *id);
 
-/* Auxilliary functions */
+/* Auxiliary functions */
 static int get_wait_data(struct cosa_data *cosa);
 static int put_wait_data(struct cosa_data *cosa, int data);
 static int puthexnumber(struct cosa_data *cosa, int number);
@@ -575,7 +575,7 @@ static int cosa_probe(int base, int irq, int dma)
 
                 /* Initialize the chardev data structures */
                 mutex_init(&chan->rlock);
-                init_MUTEX(&chan->wsem);
+                sema_init(&chan->wsem, 1);
 
                 /* Register the network interface */
                 if (!(chan->netdev = alloc_hdlcdev(chan))) {
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c
index a5ddc6c8963e..164c3624ba89 100644
--- a/drivers/net/wan/cycx_drv.c
+++ b/drivers/net/wan/cycx_drv.c
@@ -73,7 +73,7 @@ static int reset_cyc2x(void __iomem *addr);
 static int detect_cyc2x(void __iomem *addr);
 
 /* Miscellaneous functions */
-static int get_option_index(long *optlist, long optval);
+static int get_option_index(const long *optlist, long optval);
 static u16 checksum(u8 *buf, u32 len);
 
 #define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET)
@@ -81,23 +81,23 @@ static u16 checksum(u8 *buf, u32 len);
 /* Global Data */
 
 /* private data */
-static char modname[] = "cycx_drv";
-static char fullname[] = "Cyclom 2X Support Module";
-static char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
+static const char modname[] = "cycx_drv";
+static const char fullname[] = "Cyclom 2X Support Module";
+static const char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
                           "<acme@conectiva.com.br>";
 
 /* Hardware configuration options.
  * These are arrays of configuration options used by verification routines.
  * The first element of each array is its size (i.e. number of options).
  */
-static long cyc2x_dpmbase_options[] = {
+static const long cyc2x_dpmbase_options[] = {
         20,
         0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000,
         0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000,
         0xD8000, 0xDC000, 0xE0000, 0xE4000, 0xE8000, 0xEC000
 };
 
-static long cycx_2x_irq_options[]  = { 7, 3, 5, 9, 10, 11, 12, 15 };
+static const long cycx_2x_irq_options[]  = { 7, 3, 5, 9, 10, 11, 12, 15 };
 
 /* Kernel Loadable Module Entry Points */
 /* Module 'insert' entry point.
@@ -529,7 +529,7 @@ static int detect_cyc2x(void __iomem *addr)
 /* Miscellaneous */
 /* Get option's index into the options list.
  *      Return option's index (1 .. N) or zero if option is invalid. */
-static int get_option_index(long *optlist, long optval)
+static int get_option_index(const long *optlist, long optval)
 {
         int i = 1;
 
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c
index a0e8611ad8e8..859dba9b972e 100644
--- a/drivers/net/wan/cycx_main.c
+++ b/drivers/net/wan/cycx_main.c
@@ -81,9 +81,9 @@ static irqreturn_t cycx_isr(int irq, void *dev_id);
  */
 
 /* private data */
-static char cycx_drvname[] = "cyclomx";
-static char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
-static char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
+static const char cycx_drvname[] = "cyclomx";
+static const char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
+static const char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
                           "<acme@conectiva.com.br>";
 static int cycx_ncards = CONFIG_CYCX_CARDS;
 static struct cycx_device *cycx_card_array;     /* adapter data space */
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 421d0715310e..21b104db5a90 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -97,11 +97,11 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev,
 
         dest = skb_push(skb, hlen);
         if (!dest)
-                return(0);
+                return 0;
 
         memcpy(dest, &hdr, hlen);
 
-        return(hlen);
+        return hlen;
 }
 
 static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
@@ -211,14 +211,14 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
                 if (copy_from_user(&config, conf, sizeof(struct dlci_conf)))
                         return -EFAULT;
                 if (config.flags & ~DLCI_VALID_FLAGS)
-                        return(-EINVAL);
+                        return -EINVAL;
                 memcpy(&dlp->config, &config, sizeof(struct dlci_conf));
                 dlp->configured = 1;
         }
 
         err = (*flp->dlci_conf)(dlp->slave, dev, get);
         if (err)
-                return(err);
+                return err;
 
         if (get)
         {
@@ -226,7 +226,7 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
                         return -EFAULT;
         }
 
-        return(0);
+        return 0;
 }
 
 static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -234,7 +234,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         struct dlci_local *dlp;
 
         if (!capable(CAP_NET_ADMIN))
-                return(-EPERM);
+                return -EPERM;
 
         dlp = netdev_priv(dev);
 
@@ -242,7 +242,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         {
                 case DLCI_GET_SLAVE:
                         if (!*(short *)(dev->dev_addr))
-                                return(-EINVAL);
+                                return -EINVAL;
 
                         strncpy(ifr->ifr_slave, dlp->slave->name, sizeof(ifr->ifr_slave));
                         break;
@@ -250,15 +250,15 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 case DLCI_GET_CONF:
                 case DLCI_SET_CONF:
                         if (!*(short *)(dev->dev_addr))
-                                return(-EINVAL);
+                                return -EINVAL;
 
-                        return(dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF));
+                        return dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF);
                         break;
 
                 default: 
-                        return(-EOPNOTSUPP);
+                        return -EOPNOTSUPP;
         }
-        return(0);
+        return 0;
 }
 
 static int dlci_change_mtu(struct net_device *dev, int new_mtu)
@@ -277,15 +277,15 @@ static int dlci_open(struct net_device *dev)
         dlp = netdev_priv(dev);
 
         if (!*(short *)(dev->dev_addr))
-                return(-EINVAL);
+                return -EINVAL;
 
         if (!netif_running(dlp->slave))
-                return(-ENOTCONN);
+                return -ENOTCONN;
 
         flp = netdev_priv(dlp->slave);
         err = (*flp->activate)(dlp->slave, dev);
         if (err)
-                return(err);
+                return err;
 
         netif_start_queue(dev);
 
@@ -341,10 +341,6 @@ static int dlci_add(struct dlci_add *dlci)
                 }
         }
 
-        err = dev_alloc_name(master, master->name);
-        if (err < 0)
-                goto err2;
-
         *(short *)(master->dev_addr) = dlci->dlci;
 
         dlp = netdev_priv(master);
@@ -365,14 +361,14 @@ static int dlci_add(struct dlci_add *dlci)
         list_add(&dlp->list, &dlci_devs);
         rtnl_unlock();
 
-        return(0);
+        return 0;
 
  err2:
         rtnl_unlock();
         free_netdev(master);
  err1:
         dev_put(slave);
-        return(err);
+        return err;
 }
 
 static int dlci_del(struct dlci_add *dlci)
@@ -385,10 +381,10 @@ static int dlci_del(struct dlci_add *dlci)
         /* validate slave device */
         master = __dev_get_by_name(&init_net, dlci->devname);
         if (!master)
-                return(-ENODEV);
+                return -ENODEV;
 
         if (netif_running(master)) {
-                return(-EBUSY);
+                return -EBUSY;
         }
 
         dlp = netdev_priv(master);
@@ -406,7 +402,7 @@ static int dlci_del(struct dlci_add *dlci)
         }
         rtnl_unlock();
 
-        return(err);
+        return err;
 }
 
 static int dlci_ioctl(unsigned int cmd, void __user *arg)
@@ -415,7 +411,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
         int err;
         
         if (!capable(CAP_NET_ADMIN))
-                return(-EPERM);
+                return -EPERM;
 
         if (copy_from_user(&add, arg, sizeof(struct dlci_add)))
                 return -EFAULT;
@@ -438,7 +434,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
                         err = -EINVAL;
         }
 
-        return(err);
+        return err;
 }
 
 static const struct header_ops dlci_header_ops = {
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index d45b08d1dbc9..acb9ea830628 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -56,7 +56,7 @@
  * IV. Notes
  * The current error (XDU, RFO) recovery code is untested.
  * So far, RDO takes his RX channel down and the right sequence to enable it
- * again is still a mistery. If RDO happens, plan a reboot. More details
+ * again is still a mystery. If RDO happens, plan a reboot. More details
  * in the code (NB: as this happens, TX still works).
  * Don't mess the cables during operation, especially on DTE ports. I don't
  * suggest it for DCE either but at least one can get some messages instead
@@ -125,7 +125,7 @@ static u32 dscc4_pci_config_store[16];
 /* Module parameters */
 
 MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>");
-MODULE_DESCRIPTION("Siemens PEB20534 PCI Controler");
+MODULE_DESCRIPTION("Siemens PEB20534 PCI Controller");
 MODULE_LICENSE("GPL");
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug,"Enable/disable extra messages");
@@ -1065,7 +1065,7 @@ static int dscc4_open(struct net_device *dev)
 
         /*
          * Due to various bugs, there is no way to reliably reset a
-         * specific port (manufacturer's dependant special PCI #RST wiring
+         * specific port (manufacturer's dependent special PCI #RST wiring
          * apart: it affects all ports). Thus the device goes in the best
          * silent mode possible at dscc4_close() time and simply claims to
          * be up if it's opened again. It still isn't possible to change
@@ -1230,9 +1230,9 @@ static inline int dscc4_check_clock_ability(int port)
  *   scaling. Of course some rounding may take place.
  * - no high speed mode (40Mb/s). May be trivial to do but I don't have an
  *   appropriate external clocking device for testing.
- * - no time-slot/clock mode 5: shameless lazyness.
+ * - no time-slot/clock mode 5: shameless laziness.
  *
- * The clock signals wiring can be (is ?) manufacturer dependant. Good luck.
+ * The clock signals wiring can be (is ?) manufacturer dependent. Good luck.
  *
  * BIG FAT WARNING: if the device isn't provided enough clocking signal, it
  * won't pass the init sequence. For example, straight back-to-back DTE without
@@ -1358,7 +1358,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return ret;
 }
 
-static int dscc4_match(struct thingie *p, int value)
+static int dscc4_match(const struct thingie *p, int value)
 {
         int i;
 
@@ -1403,7 +1403,7 @@ done:
 static int dscc4_encoding_setting(struct dscc4_dev_priv *dpriv,
                                   struct net_device *dev)
 {
-        struct thingie encoding[] = {
+        static const struct thingie encoding[] = {
                 { ENCODING_NRZ,         0x00000000 },
                 { ENCODING_NRZI,        0x00200000 },
                 { ENCODING_FM_MARK,     0x00400000 },
@@ -1442,7 +1442,7 @@ static int dscc4_loopback_setting(struct dscc4_dev_priv *dpriv,
 static int dscc4_crc_setting(struct dscc4_dev_priv *dpriv,
                              struct net_device *dev)
 {
-        struct thingie crc[] = {
+        static const struct thingie crc[] = {
                 { PARITY_CRC16_PR0_CCITT,       0x00000010 },
                 { PARITY_CRC16_PR1_CCITT,       0x00000000 },
                 { PARITY_CRC32_PR0_CCITT,       0x00000011 },
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index e050bd65e037..777d1a4e81b2 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2203,8 +2203,10 @@ fst_open(struct net_device *dev)
 
         if (port->mode != FST_RAW) {
                 err = hdlc_open(dev);
-                if (err)
+                if (err) {
+                        module_put(THIS_MODULE);
                         return err;
+                }
         }
 
         fst_openport(port);
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index ea476cbd38b5..e305274f83fb 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -293,6 +293,7 @@ static inline void sca_tx_done(port_t *port)
         struct net_device *dev = port->netdev;
         card_t* card = port->card;
         u8 stat;
+        unsigned count = 0;
 
         spin_lock(&port->lock);
 
@@ -316,10 +317,12 @@ static inline void sca_tx_done(port_t *port)
                         dev->stats.tx_bytes += readw(&desc->len);
                 }
                 writeb(0, &desc->stat); /* Free descriptor */
+                count++;
                 port->txlast = (port->txlast + 1) % card->tx_ring_buffers;
         }
 
-        netif_wake_queue(dev);
+        if (count)
+                netif_wake_queue(dev);
         spin_unlock(&port->lock);
 }
 
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 9937bbab938d..5d4bb615ccce 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -109,7 +109,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
                 return NOTIFY_DONE; /* not an HDLC device */
 
         if (event != NETDEV_CHANGE)
-                return NOTIFY_DONE; /* Only interrested in carrier changes */
+                return NOTIFY_DONE; /* Only interested in carrier changes */
 
         on = netif_carrier_ok(dev);
 
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index b38ffa149aba..b1e5e5b69c2a 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -191,7 +191,8 @@ static int cisco_rx(struct sk_buff *skb)
 
                 switch (ntohl (cisco_data->type)) {
                 case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */
-                        in_dev = dev->ip_ptr;
+                        rcu_read_lock();
+                        in_dev = __in_dev_get_rcu(dev);
                         addr = 0;
                         mask = ~cpu_to_be32(0); /* is the mask correct? */
 
@@ -211,6 +212,7 @@ static int cisco_rx(struct sk_buff *skb)
                                 cisco_keepalive_send(dev, CISCO_ADDR_REPLY,
                                                      addr, mask);
                         }
+                        rcu_read_unlock();
                         dev_kfree_skb_any(skb);
                         return NET_RX_SUCCESS;
 
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 0edb535bb2b5..fc433f28c047 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1070,7 +1070,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
         hdlc_device *hdlc = dev_to_hdlc(frad);
         pvc_device *pvc;
         struct net_device *dev;
-        int result, used;
+        int used;
 
         if ((pvc = add_pvc(frad, dlci)) == NULL) {
                 printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n",
@@ -1106,13 +1106,6 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
         dev->tx_queue_len = 0;
         dev->ml_priv = pvc;
 
-        result = dev_alloc_name(dev, dev->name);
-        if (result < 0) {
-                free_netdev(dev);
-                delete_unused_pvcs(hdlc);
-                return result;
-        }
-
         if (register_netdevice(dev) != 0) {
                 free_netdev(dev);
                 delete_unused_pvcs(hdlc);
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 48edc5f4dac8..e817583e6ec5 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -15,7 +15,7 @@
  *      The hardware does the bus handling to avoid the need for delays between
  *      touching control registers.
  *
- *      Port B isnt wired (why - beats me)
+ *      Port B isn't wired (why - beats me)
  *
  *      Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
  */
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index 6c571e198835..f1e1643dc3eb 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -178,7 +178,7 @@
  *
  * The resulting average clock frequency (assuming 33.333 MHz oscillator) is:
  * freq = 66.666 MHz / (A + (B + 1) / (C + 1))
- * minumum freq = 66.666 MHz / (A + 1)
+ * minimum freq = 66.666 MHz / (A + 1)
  * maximum freq = 66.666 MHz / A
  *
  * Example: A = 2, B = 2, C = 7, CLOCK_CR register = 2 << 22 | 2 << 12 | 7
@@ -230,7 +230,7 @@
 #define PKT_PIPE_MODE_WRITE             0x57
 
 /* HDLC packet status values - desc->status */
-#define ERR_SHUTDOWN            1 /* stop or shutdown occurrance */
+#define ERR_SHUTDOWN            1 /* stop or shutdown occurrence */
 #define ERR_HDLC_ALIGN          2 /* HDLC alignment error */
 #define ERR_HDLC_FCS            3 /* HDLC Frame Check Sum error */
 #define ERR_RXFREE_Q_EMPTY      4 /* RX-free queue became empty while receiving
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 4d4dc38c7290..eec463f99c09 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -46,7 +46,7 @@
 
 #include <net/x25device.h>
 
-static char bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+static const u8 bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 /* If this number is made larger, check that the temporary string buffer
  * in lapbeth_new_device is large enough to store the probe device name.*/
@@ -338,10 +338,6 @@ static int lapbeth_new_device(struct net_device *dev)
         dev_hold(dev);
         lapbeth->ethdev = dev;
 
-        rc = dev_alloc_name(ndev, ndev->name);
-        if (rc < 0) 
-                goto fail;
-
         rc = -EIO;
         if (register_netdevice(ndev))
                 goto fail;
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile
index dabdcfed4efd..609710d64eb5 100644
--- a/drivers/net/wan/lmc/Makefile
+++ b/drivers/net/wan/lmc/Makefile
@@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
 # -DDEBUG \
 # -DLMC_PACKET_LOG
 
-EXTRA_CFLAGS += -I. $(DBGDEF)
+ccflags-y := -I. $(DBGDEF)
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index e2c6f7f4f51c..b7f2358d23be 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -24,7 +24,7 @@
   *
   * Linux driver notes:
   * Linux uses the device struct lmc_private to pass private information
-  * arround.
+  * around.
   *
   * The initialization portion of this driver (the lmc_reset() and the
   * lmc_dec_reset() functions, as well as the led controls and the
@@ -1022,7 +1022,7 @@ static int lmc_open(struct net_device *dev)
 
     if (sc->lmc_ok){
         lmc_trace(dev, "lmc_open lmc_ok out");
-        return (0);
+        return 0;
     }
 
     lmc_softreset (sc);
@@ -1105,12 +1105,12 @@ static int lmc_open(struct net_device *dev)
     init_timer (&sc->timer);
     sc->timer.expires = jiffies + HZ;
     sc->timer.data = (unsigned long) dev;
-    sc->timer.function = &lmc_watchdog;
+    sc->timer.function = lmc_watchdog;
     add_timer (&sc->timer);
 
     lmc_trace(dev, "lmc_open out");
 
-    return (0);
+    return 0;
 }
 
 /* Total reset to compensate for the AdTran DSU doing bad things
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 65d01978e784..01ad45218d19 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -180,7 +180,7 @@ struct lmc___ctl {
 
 
 /*
- * Carefull, look at the data sheet, there's more to this
+ * Careful, look at the data sheet, there's more to this
  * structure than meets the eye.  It should probably be:
  *
  * struct tulip_desc_t {
@@ -380,7 +380,7 @@ struct lmc___softc {
 /* CSR6 settings */
 #define OPERATION_MODE  0x00000200 /* Full Duplex      */
 #define PROMISC_MODE    0x00000040 /* Promiscuous Mode */
-#define RECIEVE_ALL     0x40000000 /* Recieve All      */
+#define RECIEVE_ALL     0x40000000 /* Receive All      */
 #define PASS_BAD_FRAMES 0x00000008 /* Pass Bad Frames  */
 
 /* Dec control registers  CSR6 as well */
@@ -398,7 +398,7 @@ struct lmc___softc {
 #define TULIP_CMD_RECEIVEALL    0x40000000L /* (RW)  Receivel all frames? */
 #define TULIP_CMD_MUSTBEONE     0x02000000L /* (RW)  Must Be One (21140) */
 #define TULIP_CMD_TXTHRSHLDCTL  0x00400000L /* (RW)  Transmit Threshold Mode (21140) */
-#define TULIP_CMD_STOREFWD      0x00200000L /* (RW)  Store and Foward (21140) */
+#define TULIP_CMD_STOREFWD      0x00200000L /* (RW)  Store and Forward (21140) */
 #define TULIP_CMD_NOHEARTBEAT   0x00080000L /* (RW)  No Heartbeat (21140) */
 #define TULIP_CMD_PORTSELECT    0x00040000L /* (RW)  Post Select (100Mb) (21140) */
 #define TULIP_CMD_FULLDUPLEX    0x00000200L /* (RW)  Full Duplex Mode */
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 5394b51bdb2f..17d408fe693f 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -282,7 +282,7 @@ static int n2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                     new_line.clock_type != CLOCK_TXFROMRX &&
                     new_line.clock_type != CLOCK_INT &&
                     new_line.clock_type != CLOCK_TXINT)
-                return -EINVAL; /* No such clock setting */
+                        return -EINVAL; /* No such clock setting */
 
                 if (new_line.loopback != 0 && new_line.loopback != 1)
                         return -EINVAL;
@@ -379,14 +379,14 @@ static int __init n2_run(unsigned long io, unsigned long irq,
         if (request_irq(irq, sca_intr, 0, devname, card)) {
                 printk(KERN_ERR "n2: could not allocate IRQ\n");
                 n2_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
         }
         card->irq = irq;
 
         if (!request_mem_region(winbase, USE_WINDOWSIZE, devname)) {
                 printk(KERN_ERR "n2: could not request RAM window\n");
                 n2_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
         }
         card->phy_winbase = winbase;
         card->winbase = ioremap(winbase, USE_WINDOWSIZE);
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index c6aa66e5b52f..9617d3d0ee39 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -1,5 +1,5 @@
 #define USE_PCI_CLOCK
-static char rcsid[] = 
+static const char rcsid[] =
 "Revision: 3.4.5 Date: 2002/03/07 ";
 
 /*
@@ -451,11 +451,11 @@ static int dma_get_rx_frame_size(pc300_t * card, int ch)
                 if ((status & DST_EOM) || (first_bd == card->chan[ch].rx_last_bd)) {
                         /* Return the size of a good frame or incomplete bad frame 
                         * (dma_buf_read will clean the buffer descriptors in this case). */
-                        return (rcvd);
+                        return rcvd;
                 }
                 ptdescr = (card->hw.rambase + cpc_readl(&ptdescr->next));
         }
-        return (-1);
+        return -1;
 }
 
 /*
@@ -557,7 +557,7 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)
                 cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch),
                            RX_BD_ADDR(ch, chan->rx_last_bd));
         }
-        return (rcvd);
+        return rcvd;
 }
 
 static void tx_dma_stop(pc300_t * card, int ch)
@@ -1445,7 +1445,7 @@ static void falc_update_stats(pc300_t * card, int ch)
  * Description: In the remote loopback mode the clock and data recovered
  *              from the line inputs RL1/2 or RDIP/RDIN are routed back
  *              to the line outputs XL1/2 or XDOP/XDON via the analog
- *              transmitter. As in normal mode they are processsed by
+ *              transmitter. As in normal mode they are processed by
  *              the synchronizer and then sent to the system interface.
  *----------------------------------------------------------------------------
  */
@@ -1733,7 +1733,7 @@ static u16 falc_pattern_test_error(pc300_t * card, int ch)
         pc300ch_t *chan = (pc300ch_t *) & card->chan[ch];
         falc_t *pfalc = (falc_t *) & chan->falc;
 
-        return (pfalc->bec);
+        return pfalc->bec;
 }
 
 /**********************************/
@@ -2819,7 +2819,7 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
         *br_io = 0;
 
         if (rate == 0)
-                return (0);
+                return 0;
 
         for (br = 0, br_pwr = 1; br <= 9; br++, br_pwr <<= 1) {
                 if ((tc = clock / br_pwr / rate) <= 0xff) {
@@ -2832,11 +2832,11 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
                 error = ((rate - (clock / br_pwr / rate)) / rate) * 1000;
                 /* Errors bigger than +/- 1% won't be tolerated */
                 if (error < -10 || error > 10)
-                        return (-1);
+                        return -1;
                 else
-                        return (tc);
+                        return tc;
         } else {
-                return (-1);
+                return -1;
         }
 }
 
@@ -3207,7 +3207,7 @@ static u32 detect_ram(pc300_t * card)
                         break;
                 }
         }
-        return (i);
+        return i;
 }
 
 static void plx_init(pc300_t * card)
@@ -3242,8 +3242,7 @@ static inline void show_version(void)
         rcsdate++;
         tmp = strrchr(rcsdate, ' ');
         *tmp = '\0';
-        printk(KERN_INFO "Cyclades-PC300 driver %s %s (built %s %s)\n", 
-                rcsvers, rcsdate, __DATE__, __TIME__);
+        printk(KERN_INFO "Cyclades-PC300 driver %s %s\n", rcsvers, rcsdate);
 }                               /* show_version */
 
 static const struct net_device_ops cpc_netdev_ops = {
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 4293889e287e..1c65d1c33873 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -131,9 +131,8 @@ static void cpc_tty_trace(pc300dev_t *dev, char* buf, int len, char rxtx);
 static void cpc_tty_signal_off(pc300dev_t *pc300dev, unsigned char);
 static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char);
 
-static int pc300_tiocmset(struct tty_struct *, struct file *,
-                          unsigned int, unsigned int);
-static int pc300_tiocmget(struct tty_struct *, struct file *);
+static int pc300_tiocmset(struct tty_struct *, unsigned int, unsigned int);
+static int pc300_tiocmget(struct tty_struct *);
 
 /* functions called by PC300 driver */
 void cpc_tty_init(pc300dev_t *dev);
@@ -540,10 +539,10 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty)
                 return -ENODEV; 
         }
    
-        return(0); 
+        return 0;
 } 
 
-static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
+static int pc300_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
         st_cpc_tty_area    *cpc_tty; 
@@ -570,7 +569,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
         return 0;
 }
 
-static int pc300_tiocmget(struct tty_struct *tty, struct file *file)
+static int pc300_tiocmget(struct tty_struct *tty)
 {
         unsigned int result;
         unsigned char status;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index e2cff64a446a..fd7375955e41 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -220,7 +220,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                     new_line.clock_type != CLOCK_TXFROMRX &&
                     new_line.clock_type != CLOCK_INT &&
                     new_line.clock_type != CLOCK_TXINT)
-                return -EINVAL; /* No such clock setting */
+                        return -EINVAL; /* No such clock setting */
 
                 if (new_line.loopback != 0 && new_line.loopback != 1)
                         return -EINVAL;
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index f4125da2762f..3f4e2b5684db 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -178,7 +178,7 @@ static char sdla_byte(struct net_device *dev, int addr)
         byte = *temp;
         spin_unlock_irqrestore(&sdla_lock, flags);
 
-        return(byte);
+        return byte;
 }
 
 static void sdla_stop(struct net_device *dev)
@@ -267,7 +267,7 @@ static int sdla_z80_poll(struct net_device *dev, int z80_addr, int jiffs, char r
                         resp = *temp;
                 }
         }
-        return(time_before(jiffies, done) ? jiffies - start : -1);
+        return time_before(jiffies, done) ? jiffies - start : -1;
 }
 
 /* constants for Z80 CPU speed */
@@ -283,13 +283,13 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
 
         sdla_start(dev);
         if (sdla_z80_poll(dev, 0, 3*HZ, Z80_READY, 0) < 0)
-                return(-EIO);
+                return -EIO;
 
         data = LOADER_READY;
         sdla_write(dev, 0, &data, 1);
 
         if ((jiffs = sdla_z80_poll(dev, 0, 8*HZ, Z80_SCC_OK, Z80_SCC_BAD)) < 0)
-                return(-EIO);
+                return -EIO;
 
         sdla_stop(dev);
         sdla_read(dev, 0, &data, 1);
@@ -297,11 +297,11 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
         if (data == Z80_SCC_BAD)
         {
                 printk("%s: SCC bad\n", dev->name);
-                return(-EIO);
+                return -EIO;
         }
 
         if (data != Z80_SCC_OK)
-                return(-EINVAL);
+                return -EINVAL;
 
         if (jiffs < 165)
                 ifr->ifr_mtu = SDLA_CPU_16M;
@@ -316,7 +316,7 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
         else
                 ifr->ifr_mtu = SDLA_CPU_3M;
  
-        return(0);
+        return 0;
 }
 
 /************************************************
@@ -493,7 +493,7 @@ static int sdla_cmd(struct net_device *dev, int cmd, short dlci, short flags,
         if (ret != SDLA_RET_OK)
                 sdla_errors(dev, cmd, dlci, ret, len, &status);
 
-        return(ret);
+        return ret;
 }
 
 /***********************************************
@@ -516,14 +516,14 @@ static int sdla_activate(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->dlci[i] = abs(flp->dlci[i]);
 
         if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE))
                 sdla_cmd(slave, SDLA_ACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_deactivate(struct net_device *slave, struct net_device *master)
@@ -538,14 +538,14 @@ static int sdla_deactivate(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->dlci[i] = -abs(flp->dlci[i]);
 
         if (netif_running(slave) && (flp->config.station == FRAD_STATION_NODE))
                 sdla_cmd(slave, SDLA_DEACTIVATE_DLCI, 0, 0, &flp->dlci[i], sizeof(short), NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_assoc(struct net_device *slave, struct net_device *master)
@@ -554,7 +554,7 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
         int               i;
 
         if (master->type != ARPHRD_DLCI)
-                return(-EINVAL);
+                return -EINVAL;
 
         flp = netdev_priv(slave);
 
@@ -563,11 +563,11 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
                 if (!flp->master[i])
                         break;
                 if (abs(flp->dlci[i]) == *(short *)(master->dev_addr))
-                        return(-EADDRINUSE);
+                        return -EADDRINUSE;
         } 
 
         if (i == CONFIG_DLCI_MAX)
-                return(-EMLINK);  /* #### Alan: Comments on this ?? */
+                return -EMLINK;  /* #### Alan: Comments on this ?? */
 
 
         flp->master[i] = master;
@@ -581,7 +581,7 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
                         sdla_cmd(slave, SDLA_ADD_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_deassoc(struct net_device *slave, struct net_device *master)
@@ -596,7 +596,7 @@ static int sdla_deassoc(struct net_device *slave, struct net_device *master)
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         flp->master[i] = NULL;
         flp->dlci[i] = 0;
@@ -609,7 +609,7 @@ static int sdla_deassoc(struct net_device *slave, struct net_device *master)
                         sdla_cmd(slave, SDLA_DELETE_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, int get)
@@ -626,7 +626,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
                         break;
 
         if (i == CONFIG_DLCI_MAX)
-                return(-ENODEV);
+                return -ENODEV;
 
         dlp = netdev_priv(master);
 
@@ -641,7 +641,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
                                     &dlp->config, sizeof(struct dlci_conf) - 4 * sizeof(short), NULL, NULL);
         }
 
-        return(ret == SDLA_RET_OK ? 0 : -EIO);
+        return ret == SDLA_RET_OK ? 0 : -EIO;
 }
 
 /**************************
@@ -986,7 +986,7 @@ static int sdla_close(struct net_device *dev)
 
         netif_stop_queue(dev);
         
-        return(0);
+        return 0;
 }
 
 struct conf_data {
@@ -1006,10 +1006,10 @@ static int sdla_open(struct net_device *dev)
         flp = netdev_priv(dev);
 
         if (!flp->initialized)
-                return(-EPERM);
+                return -EPERM;
 
         if (!flp->configured)
-                return(-EPERM);
+                return -EPERM;
 
         /* time to send in the configuration */
         len = 0;
@@ -1087,7 +1087,7 @@ static int sdla_open(struct net_device *dev)
 
         netif_start_queue(dev);
         
-        return(0);
+        return 0;
 }
 
 static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, int get)
@@ -1098,48 +1098,48 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
         short             size;
 
         if (dev->type == 0xFFFF)
-                return(-EUNATCH);
+                return -EUNATCH;
 
         flp = netdev_priv(dev);
 
         if (!get)
         {
                 if (netif_running(dev))
-                        return(-EBUSY);
+                        return -EBUSY;
 
                 if(copy_from_user(&data.config, conf, sizeof(struct frad_conf)))
                         return -EFAULT;
 
                 if (data.config.station & ~FRAD_STATION_NODE)
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if (data.config.flags & ~FRAD_VALID_FLAGS)
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.kbaud < 0) || 
                          ((data.config.kbaud > 128) && (flp->type != SDLA_S508)))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if (data.config.clocking & ~(FRAD_CLOCK_INT | SDLA_S508_PORT_RS232))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.mtu < 0) || (data.config.mtu > SDLA_MAX_MTU))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.T391 < 5) || (data.config.T391 > 30))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.T392 < 5) || (data.config.T392 > 30))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N391 < 1) || (data.config.N391 > 255))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N392 < 1) || (data.config.N392 > 10))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 if ((data.config.N393 < 1) || (data.config.N393 > 10))
-                        return(-EINVAL);
+                        return -EINVAL;
 
                 memcpy(&flp->config, &data.config, sizeof(struct frad_conf));
                 flp->config.flags |= SDLA_DIRECT_RECV;
@@ -1171,7 +1171,7 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
                 {
                         size = sizeof(data);
                         if (sdla_cmd(dev, SDLA_READ_DLCI_CONFIGURATION, 0, 0, NULL, 0, &data, &size) != SDLA_RET_OK)
-                                return(-EIO);
+                                return -EIO;
                 }
                 else
                         if (flp->configured)
@@ -1185,7 +1185,7 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
                 return copy_to_user(conf, &data.config, sizeof(struct frad_conf))?-EFAULT:0;
         }
 
-        return(0);
+        return 0;
 }
 
 static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int read)
@@ -1200,7 +1200,7 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
         {       
                 temp = kzalloc(mem.len, GFP_KERNEL);
                 if (!temp)
-                        return(-ENOMEM);
+                        return -ENOMEM;
                 sdla_read(dev, mem.addr, temp, mem.len);
                 if(copy_to_user(mem.data, temp, mem.len))
                 {
@@ -1217,7 +1217,7 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
                 sdla_write(dev, mem.addr, temp, mem.len);
                 kfree(temp);
         }
-        return(0);
+        return 0;
 }
 
 static int sdla_reconfig(struct net_device *dev)
@@ -1241,7 +1241,7 @@ static int sdla_reconfig(struct net_device *dev)
         sdla_cmd(dev, SDLA_SET_DLCI_CONFIGURATION, 0, 0, &data, len, NULL, NULL);
         sdla_cmd(dev, SDLA_ENABLE_COMMUNICATIONS, 0, 0, NULL, 0, NULL, NULL);
 
-        return(0);
+        return 0;
 }
 
 static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -1254,20 +1254,20 @@ static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         flp = netdev_priv(dev);
 
         if (!flp->initialized)
-                return(-EINVAL);
+                return -EINVAL;
 
         switch (cmd)
         {
                 case FRAD_GET_CONF:
                 case FRAD_SET_CONF:
-                        return(sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF));
+                        return sdla_config(dev, ifr->ifr_data, cmd == FRAD_GET_CONF);
 
                 case SDLA_IDENTIFY:
                         ifr->ifr_flags = flp->type;
                         break;
 
                 case SDLA_CPUSPEED:
-                        return(sdla_cpuspeed(dev, ifr)); 
+                        return sdla_cpuspeed(dev, ifr);
 
 /* ==========================================================
 NOTE:  This is rather a useless action right now, as the
@@ -1277,7 +1277,7 @@ NOTE:  This is rather a useless action right now, as the
 ============================================================*/
                 case SDLA_PROTOCOL:
                         if (flp->configured)
-                                return(-EALREADY);
+                                return -EALREADY;
 
                         switch (ifr->ifr_flags)
                         {
@@ -1285,7 +1285,7 @@ NOTE:  This is rather a useless action right now, as the
                                         dev->type = ifr->ifr_flags;
                                         break;
                                 default:
-                                        return(-ENOPROTOOPT);
+                                        return -ENOPROTOOPT;
                         }
                         break;
 
@@ -1297,7 +1297,7 @@ NOTE:  This is rather a useless action right now, as the
                 case SDLA_READMEM:
                         if(!capable(CAP_SYS_RAWIO))
                                 return -EPERM;
-                        return(sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM));
+                        return sdla_xfer(dev, ifr->ifr_data, cmd == SDLA_READMEM);
 
                 case SDLA_START:
                         sdla_start(dev);
@@ -1308,9 +1308,9 @@ NOTE:  This is rather a useless action right now, as the
                         break;
 
                 default:
-                        return(-EOPNOTSUPP);
+                        return -EOPNOTSUPP;
         }
-        return(0);
+        return 0;
 }
 
 static int sdla_change_mtu(struct net_device *dev, int new_mtu)
@@ -1320,10 +1320,10 @@ static int sdla_change_mtu(struct net_device *dev, int new_mtu)
         flp = netdev_priv(dev);
 
         if (netif_running(dev))
-                return(-EBUSY);
+                return -EBUSY;
 
         /* for now, you can't change the MTU! */
-        return(-EOPNOTSUPP);
+        return -EOPNOTSUPP;
 }
 
 static int sdla_set_config(struct net_device *dev, struct ifmap *map)
@@ -1337,18 +1337,18 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
         flp = netdev_priv(dev);
 
         if (flp->initialized)
-                return(-EINVAL);
+                return -EINVAL;
 
         for(i=0; i < ARRAY_SIZE(valid_port); i++)
                 if (valid_port[i] == map->base_addr)
                         break;   
 
         if (i == ARRAY_SIZE(valid_port))
-                return(-EINVAL);
+                return -EINVAL;
 
         if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){
                 printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr);
-                return(-EINVAL);
+                return -EINVAL;
         }
         base = map->base_addr;
 
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index e47f5a986b1c..24297b274cd4 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -498,7 +498,6 @@ norbuff:
 static int x25_asy_close(struct net_device *dev)
 {
         struct x25_asy *sl = netdev_priv(dev);
-        int err;
 
         spin_lock(&sl->lock);
         if (sl->tty)
@@ -507,10 +506,6 @@ static int x25_asy_close(struct net_device *dev)
         netif_stop_queue(dev);
         sl->rcount = 0;
         sl->xleft  = 0;
-        err = lapb_unregister(dev);
-        if (err != LAPB_OK)
-                printk(KERN_ERR "x25_asy_close: lapb_unregister error -%d\n",
-                        err);
         spin_unlock(&sl->lock);
         return 0;
 }
@@ -582,7 +577,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
         if (err)
                 return err;
         /* Done.  We have linked the TTY line to a channel. */
-        return sl->dev->base_addr;
+        return 0;
 }
 
 
@@ -595,6 +590,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
 static void x25_asy_close_tty(struct tty_struct *tty)
 {
         struct x25_asy *sl = tty->disc_data;
+        int err;
 
         /* First make sure we're connected. */
         if (!sl || sl->magic != X25_ASY_MAGIC)
@@ -605,6 +601,11 @@ static void x25_asy_close_tty(struct tty_struct *tty)
                 dev_close(sl->dev);
         rtnl_unlock();
 
+        err = lapb_unregister(sl->dev);
+        if (err != LAPB_OK)
+                printk(KERN_ERR "x25_asy_close: lapb_unregister error -%d\n",
+                        err);
+
         tty->disc_data = NULL;
         sl->tty = NULL;
         x25_asy_free(sl);
@@ -648,7 +649,7 @@ static int x25_asy_esc(unsigned char *s, unsigned char *d, int len)
                 }
         }
         *ptr++ = X25_END;
-        return (ptr - d);
+        return ptr - d;
 }
 
 static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index fbf5e843d48c..0806232e0f8f 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -542,7 +542,7 @@ static void z8530_dma_tx(struct z8530_channel *chan)
                 z8530_tx(chan);
                 return;
         }
-        /* This shouldnt occur in DMA mode */
+        /* This shouldn't occur in DMA mode */
         printk(KERN_ERR "DMA tx - bogus event!\n");
         z8530_tx(chan);
 }
@@ -766,7 +766,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id)
 
 EXPORT_SYMBOL(z8530_interrupt);
 
-static char reg_init[16]=
+static const u8 reg_init[16]=
 {
         0,0,0,0,
         0,0,0,0,
@@ -1206,7 +1206,7 @@ EXPORT_SYMBOL(z8530_sync_txdma_close);
  *      it exists...
  */
  
-static char *z8530_type_name[]={
+static const char *z8530_type_name[]={
         "Z8530",
         "Z85C30",
         "Z85230"
@@ -1219,7 +1219,7 @@ static char *z8530_type_name[]={
  *      @io: the port value in question
  *
  *      Describe a Z8530 in a standard format. We must pass the I/O as
- *      the port offset isnt predictable. The main reason for this function
+ *      the port offset isn't predictable. The main reason for this function
  *      is to try and get a common format of report.
  */
 
@@ -1588,7 +1588,7 @@ static void z8530_rx_done(struct z8530_channel *c)
                 unsigned long flags;
                 
                 /*
-                 *      Complete this DMA. Neccessary to find the length
+                 *      Complete this DMA. Necessary to find the length
                  */             
                  
                 flags=claim_dma_lock();
@@ -1657,7 +1657,7 @@ static void z8530_rx_done(struct z8530_channel *c)
                  *      fifo length for this. Thus we want to flip to the new
                  *      buffer and then mess around copying and allocating
                  *      things. For the current case it doesn't matter but
-                 *      if you build a system where the sync irq isnt blocked
+                 *      if you build a system where the sync irq isn't blocked
                  *      by the kernel IRQ disable then you need only block the
                  *      sync IRQ for the RT_LOCK area.
                  *