patch-2.4.25 linux-2.4.25/drivers/net/wireless/airo.c
Next file: linux-2.4.25/drivers/parport/Config.in
Previous file: linux-2.4.25/drivers/net/wan/pci200syn.c
Back to the patch index
Back to the overall index
- Lines: 63
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/net/wireless/airo.c
- Orig date:
2003-11-28 10:26:20.000000000 -0800
diff -urN linux-2.4.24/drivers/net/wireless/airo.c linux-2.4.25/drivers/net/wireless/airo.c
@@ -1034,7 +1034,6 @@
#define FLAG_802_11 7
#define FLAG_PENDING_XMIT 9
#define FLAG_PENDING_XMIT11 10
-#define FLAG_PCI 11
#define JOB_MASK 0x1ff0000
#define JOB_DIE 16
#define JOB_XMIT 17
@@ -2476,11 +2475,8 @@
OUT4500( apriv, EVACK, EV_MIC );
#ifdef MICSUPPORT
if (test_bit(FLAG_MIC_CAPABLE, &apriv->flags)) {
- if (down_trylock(&apriv->sem) != 0) {
- set_bit(JOB_MIC, &apriv->flags);
- wake_up_interruptible(&apriv->thr_wait);
- } else
- micinit (apriv);
+ set_bit(JOB_MIC, &apriv->flags);
+ wake_up_interruptible(&apriv->thr_wait);
}
#endif
}
@@ -4642,7 +4638,6 @@
return -ENODEV;
pci_set_drvdata(pdev, dev);
- set_bit (FLAG_PCI, &((struct airo_info *)dev->priv)->flags);
return 0;
}
@@ -4672,7 +4667,7 @@
#ifdef CONFIG_PCI
printk( KERN_INFO "airo: Probing for PCI adapters\n" );
- pci_module_init(&airo_driver);
+ pci_register_driver(&airo_driver);
printk( KERN_INFO "airo: Finished probing for PCI adapters\n" );
#endif
@@ -4684,22 +4679,15 @@
static void __exit airo_cleanup_module( void )
{
- int is_pci = 0;
while( airo_devices ) {
printk( KERN_INFO "airo: Unregistering %s\n", airo_devices->dev->name );
-#ifdef CONFIG_PCI
- if (test_bit(FLAG_PCI, &((struct airo_info *)airo_devices->dev->priv)->flags))
- is_pci = 1;
-#endif
stop_airo_card( airo_devices->dev, 1 );
}
remove_proc_entry("aironet", proc_root_driver);
- if (is_pci) {
#ifdef CONFIG_PCI
- pci_unregister_driver(&airo_driver);
+ pci_unregister_driver(&airo_driver);
#endif
- }
}
#ifdef WIRELESS_EXT
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)