hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] cleanup // comments from ipw2200 

ipw2200 uses // comments, and uses them for removing unneeded
code. Clean it up a bit.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Machek 2006-07-11 15:34:05 +02:00 committed by John W. Linville
parent 13dca9b87e
commit 67fd6b4523
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,7 +2667,7 @@ static void ipw_fw_dma_abort(struct ipw_priv *priv)
IPW_DEBUG_FW(">> :\n"); IPW_DEBUG_FW(">> :\n");
//set the Stop and Abort bit /* set the Stop and Abort bit */
control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT; control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT;
ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control); ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control);
priv->sram_desc.last_cb_index = 0; priv->sram_desc.last_cb_index = 0;
@ -3002,8 +3002,6 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
if (rc < 0) if (rc < 0)
return rc; return rc;
// spin_lock_irqsave(&priv->lock, flags);
for (addr = IPW_SHARED_LOWER_BOUND; for (addr = IPW_SHARED_LOWER_BOUND;
addr < IPW_REGISTER_DOMAIN1_END; addr += 4) { addr < IPW_REGISTER_DOMAIN1_END; addr += 4) {
ipw_write32(priv, addr, 0); ipw_write32(priv, addr, 0);
@ -3097,8 +3095,6 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
firmware have problem getting alive resp. */ firmware have problem getting alive resp. */
ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, 0); ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, 0);
// spin_unlock_irqrestore(&priv->lock, flags);
return rc; return rc;
} }
@ -6387,13 +6383,6 @@ static int ipw_wx_set_genie(struct net_device *dev,
(wrqu->data.length && extra == NULL)) (wrqu->data.length && extra == NULL))
return -EINVAL; return -EINVAL;
//mutex_lock(&priv->mutex);
//if (!ieee->wpa_enabled) {
// err = -EOPNOTSUPP;
// goto out;
//}
if (wrqu->data.length) { if (wrqu->data.length) {
buf = kmalloc(wrqu->data.length, GFP_KERNEL); buf = kmalloc(wrqu->data.length, GFP_KERNEL);
if (buf == NULL) { if (buf == NULL) {
@ -6413,7 +6402,6 @@ static int ipw_wx_set_genie(struct net_device *dev,
ipw_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len); ipw_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len);
out: out:
//mutex_unlock(&priv->mutex);
return err; return err;
} }
@ -6426,13 +6414,6 @@ static int ipw_wx_get_genie(struct net_device *dev,
struct ieee80211_device *ieee = priv->ieee; struct ieee80211_device *ieee = priv->ieee;
int err = 0; int err = 0;
//mutex_lock(&priv->mutex);
//if (!ieee->wpa_enabled) {
// err = -EOPNOTSUPP;
// goto out;
//}
if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) { if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) {
wrqu->data.length = 0; wrqu->data.length = 0;
goto out; goto out;
@ -6447,7 +6428,6 @@ static int ipw_wx_get_genie(struct net_device *dev,
memcpy(extra, ieee->wpa_ie, ieee->wpa_ie_len); memcpy(extra, ieee->wpa_ie, ieee->wpa_ie_len);
out: out:
//mutex_unlock(&priv->mutex);
return err; return err;
} }
@ -6558,7 +6538,6 @@ static int ipw_wx_set_auth(struct net_device *dev,
ieee->ieee802_1x = param->value; ieee->ieee802_1x = param->value;
break; break;
//case IW_AUTH_ROAMING_CONTROL:
case IW_AUTH_PRIVACY_INVOKED: case IW_AUTH_PRIVACY_INVOKED:
ieee->privacy_invoked = param->value; ieee->privacy_invoked = param->value;
break; break;
@ -6680,7 +6659,7 @@ static int ipw_wx_set_mlme(struct net_device *dev,
switch (mlme->cmd) { switch (mlme->cmd) {
case IW_MLME_DEAUTH: case IW_MLME_DEAUTH:
// silently ignore /* silently ignore */
break; break;
case IW_MLME_DISASSOC: case IW_MLME_DISASSOC:
@ -9766,7 +9745,7 @@ static int ipw_wx_set_monitor(struct net_device *dev,
return 0; return 0;
} }
#endif // CONFIG_IPW2200_MONITOR #endif /* CONFIG_IPW2200_MONITOR */
static int ipw_wx_reset(struct net_device *dev, static int ipw_wx_reset(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
@ -10009,7 +9988,7 @@ static void init_sys_config(struct ipw_sys_config *sys_config)
sys_config->dot11g_auto_detection = 0; sys_config->dot11g_auto_detection = 0;
sys_config->enable_cts_to_self = 0; sys_config->enable_cts_to_self = 0;
sys_config->bt_coexist_collision_thr = 0; sys_config->bt_coexist_collision_thr = 0;
sys_config->pass_noise_stats_to_host = 1; //1 -- fix for 256 sys_config->pass_noise_stats_to_host = 1; /* 1 -- fix for 256 */
sys_config->silence_threshold = 0x1e; sys_config->silence_threshold = 0x1e;
} }