diff options
Diffstat (limited to 'drivers/net/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index b779e3a0b4dd..d8a3b3cf246e 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -363,7 +363,6 @@ typedef struct _mace_statistics { | |||
363 | 363 | ||
364 | typedef struct _mace_private { | 364 | typedef struct _mace_private { |
365 | struct pcmcia_device *p_dev; | 365 | struct pcmcia_device *p_dev; |
366 | dev_node_t node; | ||
367 | struct net_device_stats linux_stats; /* Linux statistics counters */ | 366 | struct net_device_stats linux_stats; /* Linux statistics counters */ |
368 | mace_statistics mace_stats; /* MACE chip statistics counters */ | 367 | mace_statistics mace_stats; /* MACE chip statistics counters */ |
369 | 368 | ||
@@ -491,8 +490,7 @@ static void nmclan_detach(struct pcmcia_device *link) | |||
491 | 490 | ||
492 | dev_dbg(&link->dev, "nmclan_detach\n"); | 491 | dev_dbg(&link->dev, "nmclan_detach\n"); |
493 | 492 | ||
494 | if (link->dev_node) | 493 | unregister_netdev(dev); |
495 | unregister_netdev(dev); | ||
496 | 494 | ||
497 | nmclan_release(link); | 495 | nmclan_release(link); |
498 | 496 | ||
@@ -696,18 +694,14 @@ static int nmclan_config(struct pcmcia_device *link) | |||
696 | else | 694 | else |
697 | printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n"); | 695 | printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n"); |
698 | 696 | ||
699 | link->dev_node = &lp->node; | ||
700 | SET_NETDEV_DEV(dev, &link->dev); | 697 | SET_NETDEV_DEV(dev, &link->dev); |
701 | 698 | ||
702 | i = register_netdev(dev); | 699 | i = register_netdev(dev); |
703 | if (i != 0) { | 700 | if (i != 0) { |
704 | printk(KERN_NOTICE "nmclan_cs: register_netdev() failed\n"); | 701 | printk(KERN_NOTICE "nmclan_cs: register_netdev() failed\n"); |
705 | link->dev_node = NULL; | ||
706 | goto failed; | 702 | goto failed; |
707 | } | 703 | } |
708 | 704 | ||
709 | strcpy(lp->node.dev_name, dev->name); | ||
710 | |||
711 | printk(KERN_INFO "%s: nmclan: port %#3lx, irq %d, %s port," | 705 | printk(KERN_INFO "%s: nmclan: port %#3lx, irq %d, %s port," |
712 | " hw_addr %pM\n", | 706 | " hw_addr %pM\n", |
713 | dev->name, dev->base_addr, dev->irq, if_names[dev->if_port], | 707 | dev->name, dev->base_addr, dev->irq, if_names[dev->if_port], |