slip: Remove the unused code and add some cleanups in slip.c
PATCH 1/1 slip: Remove the unused code and add some cleanups in slip.c
In sl_alloc(), after the for block:
for (i = 0; i < slip_maxdev; i++) {
dev = slip_devs[i];
if (dev == NULL)
break;
}The result is either i >= slip_maxdev or dev != NULL. So the following check on dev is needless.
Signed-off-by Li Hong <[email protected]>
--- drivers/net/slip.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-)
drivers/net/slip.c +7 -17
@@ -737,24 +737,15 @@ static struct slip *sl_alloc(dev_t line)if (i >= slip_maxdev)return NULL ; -if (dev) { - sl =netdev_priv (dev); -if (test_bit (SLF_INUSE , &sl->flags)) { -unregister_netdevice (dev); - dev =NULL ; - slip_devs[i] =NULL ; - } - } +char name[IFNAMSIZ ]; +sprintf (name,"sl%d" , i); -if (!dev) { -char name[IFNAMSIZ ]; -sprintf (name,"sl%d" , i); + dev =alloc_netdev (sizeof (*sl), name, sl_setup); +if (!dev) +return NULL ; - dev =alloc_netdev (sizeof (*sl), name, sl_setup); -if (!dev) -return NULL ; - dev->base_addr = i; - } + dev->base_addr = i; + slip_devs[i] = dev; sl =netdev_priv (dev);
@@ -772,7 +763,6 @@ static struct slip *sl_alloc(dev_t line) sl->outfill_timer.data = (unsigned long )sl; sl->outfill_timer.function = sl_outfill;#endif - slip_devs[i] = dev;return sl; }
Signature · 1 line
1.6.3.3