diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-20 14:39:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 04:23:16 -0400 |
commit | c7c2fa079073ab92b0736a161b4cf1051a3e631f (patch) | |
tree | c23bb2e89f68601e5c37a1a0df9e83c9e71f9dd6 /drivers/net/wireless/ray_cs.c | |
parent | ded6a1a341cb38c4cfeb09d3d01ffe16b5c804b3 (diff) |
pcmcia: dev_node removal (drivers with unregister_netdev check)
As a third step, remove any usage of dev_node_t from drivers which
only wrote to this typedef/struct, except to determine whether
register_netdev() succeeded previously. However, the function calling
unregister_netdev() was only ever called by the PCMCIA core if
register_netdev() succeeded previously. The lonely exception was
easily fixed.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index fe4642a49bfb..18a93f1adcc4 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -379,8 +379,7 @@ static void ray_detach(struct pcmcia_device *link) | |||
379 | del_timer(&local->timer); | 379 | del_timer(&local->timer); |
380 | 380 | ||
381 | if (link->priv) { | 381 | if (link->priv) { |
382 | if (link->dev_node) | 382 | unregister_netdev(dev); |
383 | unregister_netdev(dev); | ||
384 | free_netdev(dev); | 383 | free_netdev(dev); |
385 | } | 384 | } |
386 | dev_dbg(&link->dev, "ray_cs ray_detach ending\n"); | 385 | dev_dbg(&link->dev, "ray_cs ray_detach ending\n"); |
@@ -489,9 +488,6 @@ static int ray_config(struct pcmcia_device *link) | |||
489 | return i; | 488 | return i; |
490 | } | 489 | } |
491 | 490 | ||
492 | strcpy(local->node.dev_name, dev->name); | ||
493 | link->dev_node = &local->node; | ||
494 | |||
495 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n", | 491 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n", |
496 | dev->name, dev->irq, dev->dev_addr); | 492 | dev->name, dev->irq, dev->dev_addr); |
497 | 493 | ||