staging: wilc1000: remove useless #if 1

This patch removes #if 1, which is encapsulated some codes.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0dc6302e0eea53397bfb47e71b92ee592a59a851..7aff04a1eb08aca4ffa01cfbd8e14a58ffd99025 100644 (file)
--- 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 ba502f125d8a21ed00fac4d2c9217eaac0beec68..0a930ecef554a6b3f78617d30e591b20af84ced0 100644 (file)
--- 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 ce16775be25fcb8e021cd9a7508e155ba2510708..73a15082ac3f9a3d8300ba1218ee43d42aed2879 100644 (file)
--- 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);