staging: wilc1000: remove unused members

remove obtaining_ip from struct wilc_vif

Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
Link: https://lore.kernel.org/r/20190725213125.2810-4-adham.abozaeid@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_hif.c b/drivers/staging/wilc1000/wilc_hif.c
index 9bd2d14..611f842 100644 (file)
--- a/drivers/staging/wilc1000/wilc_hif.c
+++ b/drivers/staging/wilc1000/wilc_hif.c
@@ -248,7 +248,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
                goto error;
        }
 
-       if (vif->obtaining_ip || vif->connecting) {
+       if (vif->connecting) {
                netdev_err(vif->ndev, "Don't do obss scan\n");
                result = -EBUSY;
                goto error;
@@ -682,8 +682,6 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
                wilc_set_power_mgmt(vif, 0, 0);
 
                hif_drv->hif_state = HOST_IF_CONNECTED;
-
-               vif->obtaining_ip = true;
        } else {
                hif_drv->hif_state = HOST_IF_IDLE;
        }
@@ -707,7 +705,6 @@ static inline void host_int_handle_disconnect(struct wilc_vif *vif)
        }
 
        if (hif_drv->conn_info.conn_result) {
-               vif->obtaining_ip = false;
                wilc_set_power_mgmt(vif, 0, 0);
 
                hif_drv->conn_info.conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF,
@@ -770,7 +767,6 @@ int wilc_disconnect(struct wilc_vif *vif)
        wid.val = (s8 *)&dummy_reason_code;
        wid.size = sizeof(char);
 
-       vif->obtaining_ip = false;
        wilc_set_power_mgmt(vif, 0, 0);
 
        result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1);
@@ -922,7 +918,7 @@ static int handle_remain_on_chan(struct wilc_vif *vif,
        if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP)
                return -EBUSY;
 
-       if (vif->obtaining_ip || vif->connecting)
+       if (vif->connecting)
                return -EBUSY;
 
        remain_on_chan_flag = true;
@@ -1608,7 +1604,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
        *hif_drv_handler = hif_drv;
 
        vif->hif_drv = hif_drv;
-       vif->obtaining_ip = false;
 
        if (wilc->clients_count == 0)
                mutex_init(&wilc->deinit_lock);

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 81fe26a..deaf040 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -167,7 +167,6 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,
        } else if (conn_disconn_evt == CONN_DISCONN_EVENT_DISCONN_NOTIF) {
                u16 reason = 0;
 
-               vif->obtaining_ip = false;
                priv->p2p.local_random = 0x01;
                priv->p2p.recv_random = 0x00;
                priv->p2p.is_wilc_ie = false;
@@ -1411,7 +1410,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
        priv->p2p.local_random = 0x01;
        priv->p2p.recv_random = 0x00;
        priv->p2p.is_wilc_ie = false;
-       vif->obtaining_ip = false;
 
        switch (type) {
        case NL80211_IFTYPE_STATION:
@@ -1458,7 +1456,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
                break;
 
        case NL80211_IFTYPE_P2P_GO:
-               vif->obtaining_ip = true;
                wilc_set_operation_mode(vif, WILC_AP_MODE);
                dev->ieee80211_ptr->iftype = type;
                priv->wdev.iftype = type;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 1e74a08..704e4d5 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -203,7 +203,6 @@ struct wilc_vif {
        struct net_device *ndev;
        u8 mode;
        struct timer_list during_ip_timer;
-       bool obtaining_ip;
        struct timer_list periodic_rssi;
        struct rf_info periodic_stat;
        struct tcp_ack_filter ack_filter;