This patch removes #if 1, which is encapsulated some codes.
Signed-off-by: Chaehyun Lim <chaehyun....@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ----
drivers/staging/wilc1000/wilc_wlan.c | 2 --
drivers/staging/wilc1000/wilc_wlan_cfg.c | 2 --
3 files changed, 8 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 04d64a8..34df5da 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2947,7 +2947,6 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
PRINT_D(HOSTAPD_DBG, "Downloading P2P_CONCURRENCY_FIRMWARE\n");
- #if 1
nic->iftype = GO_MODE;
/* ensure that the message Q is empty */
@@ -2987,7 +2986,6 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
g_key_gtk_params.key[1],
g_key_gtk_params.key[2],
g_key_gtk_params.cipher);
- #if 1
add_key(g_linux_wlan->strInterfaceInfo[0].wilc_netdev->ieee80211_ptr->wiphy,
g_linux_wlan->strInterfaceInfo[0].wilc_netdev,
g_add_ptk_key_params.key_idx,
@@ -3001,9 +2999,7 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
g_add_gtk_key_params.pairwise,
g_add_gtk_key_params.mac_addr,
(struct key_params *)(&g_key_gtk_params));
- #endif
}
- #endif
if (g_linux_wlan->wilc1000_initialized) {
for (i = 0; i < num_reg_frame; i++) {
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index ba502f1..0a930ec 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1675,7 +1675,6 @@ static int wilc_wlan_stop(void)
}
} while (timeout);
-#if 1
reg = ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 8) | (1 << 9)
| (1 << 26) | (1 << 29) | (1 << 30) | (1 << 31)); /**/
/**/
p->hif_func.hif_write_reg(WILC_GLB_RESET_0, reg);
/**/
@@ -1683,7 +1682,6 @@ static int wilc_wlan_stop(void)
/**/
ret = p->hif_func.hif_write_reg(WILC_GLB_RESET_0, reg);
/**/
/******************************************************************************/
-#endif
release_bus(RELEASE_ALLOW_SLEEP);
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c
b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index ce16775..73a1508 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -534,13 +534,11 @@ static int wilc_wlan_cfg_indicate_rx(u8 *frame, int size,
wilc_cfg_rsp_t *rsp)
GnrlAsyncInfoReceived(frame - 4, size + 4);
break;
-#if 1
case 'N':
NetworkInfoReceived(frame - 4, size + 4);
rsp->type = 0;
break;
-#endif
case 'S':
PRINT_INFO(RX_DBG, "Scan Notification Received\n");
host_int_ScanCompleteReceived(frame - 4, size + 4);
--
2.5.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
