From 244d31b572c6935f30d2e0b52c6316cd5528ba41 Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Sun, 20 Sep 2015 15:51:21 +0900 Subject: [PATCH] staging: wilc1000: remove useless #if 1 This patch removes #if 1, which is encapsulated some codes. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- 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 0dc6302e0eea..7aff04a1eb08 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2948,7 +2948,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 */ @@ -2988,7 +2987,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, @@ -3002,9 +3000,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 ba502f125d8a..0a930ecef554 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 ce16775be25f..73a15082ac3f 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.34.1