Commit 93a3b607 authored by Jeff Garzik's avatar Jeff Garzik Committed by David S. Miller
Browse files

wireless: checkpatch cleanups


Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 092427be
......@@ -6408,9 +6408,8 @@ static int airo_set_encode(struct net_device *dev,
set_wep_key(local, index, NULL, 0, perm, 1);
} else
/* Don't complain if only change the mode */
if(!(dwrq->flags & IW_ENCODE_MODE)) {
if (!(dwrq->flags & IW_ENCODE_MODE))
return -EINVAL;
}
}
/* Read the flags */
if(dwrq->flags & IW_ENCODE_DISABLED)
......
......@@ -1759,9 +1759,8 @@ static int atmel_set_encode(struct net_device *dev,
priv->default_key = index;
} else
/* Don't complain if only change the mode */
if (!(dwrq->flags & IW_ENCODE_MODE)) {
if (!(dwrq->flags & IW_ENCODE_MODE))
return -EINVAL;
}
}
/* Read the flags */
if (dwrq->flags & IW_ENCODE_DISABLED) {
......
......@@ -97,7 +97,7 @@ out_unlock:
return err;
}
char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
{
struct b43legacy_wl *wl = dev->wl;
......
......@@ -27,7 +27,7 @@ void b43legacy_rfkill_free(struct b43legacy_wldev *dev);
void b43legacy_rfkill_init(struct b43legacy_wldev *dev);
void b43legacy_rfkill_exit(struct b43legacy_wldev *dev);
char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
#else /* CONFIG_B43LEGACY_RFKILL */
......@@ -49,7 +49,7 @@ static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev)
{
}
static inline char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
static inline char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
{
return NULL;
}
......
......@@ -350,7 +350,7 @@ struct iwl_eeprom {
#define CSR_FH_INT_TX_MASK (CSR_FH_INT_BIT_TX_CHNL6 | \
CSR_FH_INT_BIT_TX_CHNL1 | \
CSR_FH_INT_BIT_TX_CHNL0 )
CSR_FH_INT_BIT_TX_CHNL0)
/* RESET */
......
......@@ -400,7 +400,7 @@ struct iwl_eeprom {
#define CSR_FH_INT_TX_MASK (CSR_FH_INT_BIT_TX_CHNL6 | \
CSR_FH_INT_BIT_TX_CHNL1 | \
CSR_FH_INT_BIT_TX_CHNL0 )
CSR_FH_INT_BIT_TX_CHNL0)
/* RESET */
......
......@@ -32,10 +32,8 @@ static inline void libertas_postpone_association_work(wlan_private *priv)
static inline void libertas_cancel_association_work(wlan_private *priv)
{
cancel_delayed_work(&priv->assoc_work);
if (priv->adapter->pending_assoc_req) {
kfree(priv->adapter->pending_assoc_req);
priv->adapter->pending_assoc_req = NULL;
}
kfree(priv->adapter->pending_assoc_req);
priv->adapter->pending_assoc_req = NULL;
}
......
......@@ -3223,14 +3223,14 @@ wv_mmc_init(struct net_device * dev)
* non-NCR/AT&T/Lucent PCMCIA cards, see wavelan_cs.h for detail on
* how to configure your card...
*/
for(i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++)
if((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) &&
(psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) &&
(psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2]))
for (i = 0; i < ARRAY_SIZE(MAC_ADDRESSES); i++)
if ((psa.psa_univ_mac_addr[0] == MAC_ADDRESSES[i][0]) &&
(psa.psa_univ_mac_addr[1] == MAC_ADDRESSES[i][1]) &&
(psa.psa_univ_mac_addr[2] == MAC_ADDRESSES[i][2]))
break;
/* If we have not found it... */
if(i == ARRAY_SIZE(MAC_ADDRESSES))
if (i == ARRAY_SIZE(MAC_ADDRESSES))
{
#ifdef DEBUG_CONFIG_ERRORS
printk(KERN_WARNING "%s: wv_mmc_init(): Invalid MAC address: %02X:%02X:%02X:...\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment