lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

slcan: remove obsolete code in slcan initialisation

Browse Source 
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>
This commit is contained in:
Oliver Hartkopp
2011-07-14 21:49:19 +00:00
committed by David S. Miller
parent 8279171a5f
commit 2af4ba8591
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/can/slcan.c
View File

@@ -473,12 +473,10 @@ static void slc_sync(void)
static struct slcan *slc_alloc(dev_t line) static struct slcan *slc_alloc(dev_t line)
{ {
int i; int i;
char name[IFNAMSIZ];
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct slcan *sl; struct slcan *sl;
if (slcan_devs == NULL)
return NULL; /* Master array missing ! */
for (i = 0; i < maxdev; i++) { for (i = 0; i < maxdev; i++) {
dev = slcan_devs[i]; dev = slcan_devs[i];
if (dev == NULL) if (dev == NULL)
@@ -490,25 +488,12 @@ static struct slcan *slc_alloc(dev_t line)
if (i >= maxdev) if (i >= maxdev)
return NULL; 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); sprintf(name, "slcan%d", i);
dev = alloc_netdev(sizeof(*sl), name, slc_setup); dev = alloc_netdev(sizeof(*sl), name, slc_setup);
if (!dev) if (!dev)
return NULL; return NULL;
dev->base_addr = i;
}
dev->base_addr = i;
sl = netdev_priv(dev); sl = netdev_priv(dev);
/* Initialize channel control data */ /* Initialize channel control data */