Remove dead code in axnet_cs net driver.

del_timer_sync and printk fixes in fmvj18x_cs net driver.

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index ad5000f727de9253cf233cbcf98942d415bca318..afc89f5804e20604279b1c49588e030e655edd85 100644 (file)
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1134,27 +1134,6 @@ static int ei_open(struct net_device *dev)
        return 0;
 }
 
-/**
- * ei_close - shut down network device
- * @dev: network device to close
- *
- * Opposite of ei_open(). Only used when "ifconfig <devname> down" is done.
- */
-static int ei_close(struct net_device *dev)
-{
-       unsigned long flags;
-
-       /*
-        *      Hold the page lock during close
-        */
-
-       spin_lock_irqsave(&((struct ei_device *)dev->priv)->page_lock, flags);
-       NS8390_init(dev, 0);
-       spin_unlock_irqrestore(&((struct ei_device *)dev->priv)->page_lock, flags);
-       netif_stop_queue(dev);
-       return 0;
-}
-
 /**
  * ei_tx_timeout - handle transmit time out condition
  * @dev: network device which has apparently fallen asleep

diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 04df36c4be023d2a53309e942a52f377078584bc..58d930be2f5c2a97fac4fa6f64cdcb1de99dec22 100644 (file)
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -362,7 +362,7 @@ static void fmvj18x_detach(dev_link_t *link)
     if (*linkp == NULL)
        return;
 
-    del_timer(&link->release);
+    del_timer_sync(&link->release);
     if (link->state & DEV_CONFIG) {
        fmvj18x_release((u_long)link);
        if (link->state & DEV_STALE_CONFIG) {
@@ -571,8 +571,7 @@ req_irq:
     case XXX10304:
        /* Read MACID from Buggy CIS */
        if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) {
-           printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net 
-               address.");
+           printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n");
            unregister_netdev(dev);
            goto failed;
        }