slcan: remove obsolete code in slcan initialisation

This patch removes obsolete code in the initialisation/creation of
slcan devices.

It follows the suggested cleanups from Ilya Matvejchikov in
drivers/net/slip.c that where recently applied to net-next-2.6:

- slip: remove dead code within the slip initialization
- slip: remove redundant check slip_devs for NULL

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 21 deletions

diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 1b49df6b2470..aa8ad73477ba 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -473,12 +473,10 @@ static void slc_sync(void)
 static struct slcan *slc_alloc(dev_t line)
 {
         int i;
+        char name[IFNAMSIZ];
         struct net_device *dev = NULL;
         struct slcan       *sl;
 
-        if (slcan_devs == NULL)
-                return NULL;    /* Master array missing ! */
-
         for (i = 0; i < maxdev; i++) {
                 dev = slcan_devs[i];
                 if (dev == NULL)
@@ -490,25 +488,12 @@ static struct slcan *slc_alloc(dev_t line)
         if (i >= maxdev)
                 return NULL;
 
-        if (dev) {
-                sl = netdev_priv(dev);
-                if (test_bit(SLF_INUSE, &sl->flags)) {
-                        unregister_netdevice(dev);
-                        dev = NULL;
-                        slcan_devs[i] = NULL;
-                }
-        }
-
-        if (!dev) {
-                char name[IFNAMSIZ];
-                sprintf(name, "slcan%d", i);
-
-                dev = alloc_netdev(sizeof(*sl), name, slc_setup);
-                if (!dev)
-                        return NULL;
-                dev->base_addr  = i;
-        }
+        sprintf(name, "slcan%d", i);
+        dev = alloc_netdev(sizeof(*sl), name, slc_setup);
+        if (!dev)
+                return NULL;
 
+        dev->base_addr  = i;
         sl = netdev_priv(dev);
 
         /* Initialize channel control data */