diff options
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 0225cdffa4b9..2e42d80f8cae 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -104,7 +104,6 @@ static void ibmtr_detach(struct pcmcia_device *p_dev); | |||
104 | typedef struct ibmtr_dev_t { | 104 | typedef struct ibmtr_dev_t { |
105 | struct pcmcia_device *p_dev; | 105 | struct pcmcia_device *p_dev; |
106 | struct net_device *dev; | 106 | struct net_device *dev; |
107 | dev_node_t node; | ||
108 | window_handle_t sram_win_handle; | 107 | window_handle_t sram_win_handle; |
109 | struct tok_info *ti; | 108 | struct tok_info *ti; |
110 | } ibmtr_dev_t; | 109 | } ibmtr_dev_t; |
@@ -190,8 +189,7 @@ static void ibmtr_detach(struct pcmcia_device *link) | |||
190 | */ | 189 | */ |
191 | ti->sram_phys |= 1; | 190 | ti->sram_phys |= 1; |
192 | 191 | ||
193 | if (link->dev_node) | 192 | unregister_netdev(dev); |
194 | unregister_netdev(dev); | ||
195 | 193 | ||
196 | del_timer_sync(&(ti->tr_timer)); | 194 | del_timer_sync(&(ti->tr_timer)); |
197 | 195 | ||
@@ -289,18 +287,14 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
289 | Adapters Technical Reference" SC30-3585 for this info. */ | 287 | Adapters Technical Reference" SC30-3585 for this info. */ |
290 | ibmtr_hw_setup(dev, mmiobase); | 288 | ibmtr_hw_setup(dev, mmiobase); |
291 | 289 | ||
292 | link->dev_node = &info->node; | ||
293 | SET_NETDEV_DEV(dev, &link->dev); | 290 | SET_NETDEV_DEV(dev, &link->dev); |
294 | 291 | ||
295 | i = ibmtr_probe_card(dev); | 292 | i = ibmtr_probe_card(dev); |
296 | if (i != 0) { | 293 | if (i != 0) { |
297 | printk(KERN_NOTICE "ibmtr_cs: register_netdev() failed\n"); | 294 | printk(KERN_NOTICE "ibmtr_cs: register_netdev() failed\n"); |
298 | link->dev_node = NULL; | ||
299 | goto failed; | 295 | goto failed; |
300 | } | 296 | } |
301 | 297 | ||
302 | strcpy(info->node.dev_name, dev->name); | ||
303 | |||
304 | printk(KERN_INFO | 298 | printk(KERN_INFO |
305 | "%s: port %#3lx, irq %d, mmio %#5lx, sram %#5lx, hwaddr=%pM\n", | 299 | "%s: port %#3lx, irq %d, mmio %#5lx, sram %#5lx, hwaddr=%pM\n", |
306 | dev->name, dev->base_addr, dev->irq, | 300 | dev->name, dev->base_addr, dev->irq, |