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

wireless: Small cleanups

Browse Source 
Small whitespace cleanups for wireless drivers

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Machek
2008-06-25 12:25:53 +02:00
committed by John W. Linville
parent b973e42eb2
commit e292c737fc
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/wireless/airo.c
View File

@@ -85,10 +85,10 @@ static struct pci_driver airo_driver = {
/* Include Wireless Extension definition and check version - Jean II */ /* Include Wireless Extension definition and check version - Jean II */
#include <linux/wireless.h> #include <linux/wireless.h>
#define WIRELESS_SPY // enable iwspy support #define WIRELESS_SPY /* enable iwspy support */
#include <net/iw_handler.h> // New driver API #include <net/iw_handler.h> /* New driver API */
#define CISCO_EXT // enable Cisco extensions #define CISCO_EXT /* enable Cisco extensions */
#ifdef CISCO_EXT #ifdef CISCO_EXT
#include <linux/delay.h> #include <linux/delay.h>
#endif #endif
@@ -281,7 +281,7 @@ MODULE_PARM_DESC(proc_perm, "The permission bits of the files in /proc");
/* This is a kind of sloppy hack to get this information to OUT4500 and /* This is a kind of sloppy hack to get this information to OUT4500 and
IN4500. I would be extremely interested in the situation where this IN4500. I would be extremely interested in the situation where this
doesn't work though!!! */ doesn't work though!!! */
static int do8bitIO = 0; static int do8bitIO /* = 0 */;
/* Return codes */ /* Return codes */
#define SUCCESS 0 #define SUCCESS 0
@@ -398,8 +398,8 @@ static int do8bitIO = 0;
#define MAXTXQ 64 #define MAXTXQ 64
/* BAP selectors */ /* BAP selectors */
#define BAP0 0 // Used for receiving packets #define BAP0 0 /* Used for receiving packets */
#define BAP1 2 // Used for xmiting packets and working with RIDS #define BAP1 2 /* Used for xmiting packets and working with RIDS */
/* Flags */ /* Flags */
#define COMMAND_BUSY 0x8000 #define COMMAND_BUSY 0x8000
@@ -5522,11 +5522,13 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
Cmd cmd; Cmd cmd;
Resp rsp; Resp rsp;
if ((ai->APList == NULL) && if (!ai->APList)
(ai->APList = kmalloc(sizeof(APListRid), GFP_KERNEL)) == NULL) ai->APList = kmalloc(sizeof(APListRid), GFP_KERNEL);
if (!ai->APList)
return -ENOMEM; return -ENOMEM;
if ((ai->SSID == NULL) && if (!ai->SSID)
(ai->SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL)) == NULL) ai->SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL);
if (!ai->SSID)
return -ENOMEM; return -ENOMEM;
readAPListRid(ai, ai->APList); readAPListRid(ai, ai->APList);
readSsidRid(ai, ai->SSID); readSsidRid(ai, ai->SSID);
@@ -5594,9 +5596,6 @@ static int airo_pci_resume(struct pci_dev *pdev)
static int __init airo_init_module( void ) static int __init airo_init_module( void )
{ {
int i; int i;
#if 0
int have_isa_dev = 0;
#endif
airo_entry = create_proc_entry("driver/aironet", airo_entry = create_proc_entry("driver/aironet",
S_IFDIR | airo_perm, S_IFDIR | airo_perm,
@@ -5611,11 +5610,7 @@ static int __init airo_init_module( void )
airo_print_info("", "Trying to configure ISA adapter at irq=%d " airo_print_info("", "Trying to configure ISA adapter at irq=%d "
"io=0x%x", irq[i], io[i] ); "io=0x%x", irq[i], io[i] );
if (init_airo_card( irq[i], io[i], 0, NULL )) if (init_airo_card( irq[i], io[i], 0, NULL ))
#if 0
have_isa_dev = 1;
#else
/* do nothing */ ; /* do nothing */ ;
#endif
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI