Skip to content

Commit

Permalink
wireless: Small cleanups
Browse files Browse the repository at this point in the history 
Small whitespace cleanups for wireless drivers

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Pavel Machek authored and John W. Linville committed Jun 27, 2008
1 parent b973e42 commit e292c73
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 25 deletions.
41 changes: 18 additions & 23 deletions drivers/net/wireless/airo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ static struct pci_driver airo_driver = {

/* Include Wireless Extension definition and check version - Jean II */
#include <linux/wireless.h>
#define WIRELESS_SPY // enable iwspy support
#include <net/iw_handler.h> // New driver API
#define WIRELESS_SPY /* enable iwspy support */
#include <net/iw_handler.h> /* New driver API */

#define CISCO_EXT // enable Cisco extensions
#define CISCO_EXT /* enable Cisco extensions */
#ifdef CISCO_EXT
#include <linux/delay.h>
#endif
Expand Down Expand Up @@ -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
IN4500. I would be extremely interested in the situation where this
doesn't work though!!! */
static int do8bitIO = 0;
static int do8bitIO /* = 0 */;

/* Return codes */
#define SUCCESS 0
Expand Down Expand Up @@ -398,8 +398,8 @@ static int do8bitIO = 0;
#define MAXTXQ 64

/* BAP selectors */
#define BAP0 0 // Used for receiving packets
#define BAP1 2 // Used for xmiting packets and working with RIDS
#define BAP0 0 /* Used for receiving packets */
#define BAP1 2 /* Used for xmiting packets and working with RIDS */

/* Flags */
#define COMMAND_BUSY 0x8000
Expand Down Expand Up @@ -5522,11 +5522,13 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
Cmd cmd;
Resp rsp;

if ((ai->APList == NULL) &&
(ai->APList = kmalloc(sizeof(APListRid), GFP_KERNEL)) == NULL)
if (!ai->APList)
ai->APList = kmalloc(sizeof(APListRid), GFP_KERNEL);
if (!ai->APList)
return -ENOMEM;
if ((ai->SSID == NULL) &&
(ai->SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL)) == NULL)
if (!ai->SSID)
ai->SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL);
if (!ai->SSID)
return -ENOMEM;
readAPListRid(ai, ai->APList);
readSsidRid(ai, ai->SSID);
Expand All @@ -5537,7 +5539,7 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
disable_MAC(ai, 0);
netif_device_detach(dev);
ai->power = state;
cmd.cmd=HOSTSLEEP;
cmd.cmd = HOSTSLEEP;
issuecommand(ai, &cmd, &rsp);

pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
Expand Down Expand Up @@ -5567,7 +5569,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
msleep(100);
}

set_bit (FLAG_COMMIT, &ai->flags);
set_bit(FLAG_COMMIT, &ai->flags);
disable_MAC(ai, 0);
msleep(200);
if (ai->SSID) {
Expand All @@ -5594,9 +5596,6 @@ static int airo_pci_resume(struct pci_dev *pdev)
static int __init airo_init_module( void )
{
int i;
#if 0
int have_isa_dev = 0;
#endif

airo_entry = create_proc_entry("driver/aironet",
S_IFDIR | airo_perm,
Expand All @@ -5607,15 +5606,11 @@ static int __init airo_init_module( void )
airo_entry->gid = proc_gid;
}

for( i = 0; i < 4 && io[i] && irq[i]; i++ ) {
for (i = 0; i < 4 && io[i] && irq[i]; i++) {
airo_print_info("", "Trying to configure ISA adapter at irq=%d "
"io=0x%x", irq[i], io[i] );
if (init_airo_card( irq[i], io[i], 0, NULL ))
#if 0
have_isa_dev = 1;
#else
/* do nothing */ ;
#endif
}

#ifdef CONFIG_PCI
Expand Down Expand Up @@ -5661,7 +5656,7 @@ static void __exit airo_cleanup_module( void )

static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid, u8 rssi)
{
if( !rssi_rid )
if (!rssi_rid)
return 0;

return (0x100 - rssi_rid[rssi].rssidBm);
Expand All @@ -5671,10 +5666,10 @@ static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm)
{
int i;

if( !rssi_rid )
if (!rssi_rid)
return 0;

for( i = 0; i < 256; i++ )
for (i = 0; i < 256; i++)
if (rssi_rid[i].rssidBm == dbm)
return rssi_rid[i].rssipct;

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/ath5k/hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
#include "base.h"
#include "debug.h"

/*Rate tables*/
/* Rate tables */
static const struct ath5k_rate_table ath5k_rt_11a = AR5K_RATES_11A;
static const struct ath5k_rate_table ath5k_rt_11b = AR5K_RATES_11B;
static const struct ath5k_rate_table ath5k_rt_11g = AR5K_RATES_11G;
static const struct ath5k_rate_table ath5k_rt_turbo = AR5K_RATES_TURBO;
static const struct ath5k_rate_table ath5k_rt_xr = AR5K_RATES_XR;

/*Prototypes*/
/* Prototypes */
static int ath5k_hw_nic_reset(struct ath5k_hw *, u32);
static int ath5k_hw_nic_wakeup(struct ath5k_hw *, int, bool);
static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *, struct ath5k_desc *,
Expand Down

0 comments on commit e292c73

Please sign in to comment.