staging: wilc1000: remove use of driver_handler_id & ifc_id

Removed the 'driver_handler_id' & 'ifc_id' elements and used 'idx' to
identify the handler.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b5059908052d037f266823d3f964780ea9086109..389f9f8c2f8c5f3f09287ac6cda0d53e9e30391c 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1472,7 +1472,7 @@ int wilc_set_wfi_drv_handler(struct wilc_vif *vif, int index, u8 mode,
        drv.mode = (ifc_id | (mode << 1));
 
        result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
-                                     hif_drv->driver_handler_id);
+                                     wilc_get_vif_idx(vif));
        if (result)
                netdev_err(vif->ndev, "Failed to set driver handler\n");
 
@@ -1644,7 +1644,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
        for (i = 0; i < wilc->vif_num; i++)
                if (dev == wilc->vif[i]->ndev) {
                        wilc->vif[i]->hif_drv = hif_drv;
-                       hif_drv->driver_handler_id = i + 1;
                        break;
                }
 

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 4fcc7a3c151d126773d93b03fe023979d650f4ef..be1d2497cde9c8b8dce538fa4fe48b8ed233aaa9 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -166,7 +166,6 @@ struct host_if_drv {
        struct wilc_vif *remain_on_ch_timer_vif;
 
        bool ifc_up;
-       int driver_handler_id;
        u8 assoc_resp[WILC_MAX_ASSOC_RESP_FRAME_SIZE];
 };
 

diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c
index 900611136a84f9dfea96e14e62fbd58dc8ea4ac7..ad04744c4e4f219309f835eb265a5d64a2d9455b 100644 (file)
--- a/drivers/staging/wilc1000/wilc_netdev.c
+++ b/drivers/staging/wilc1000/wilc_netdev.c
@@ -636,7 +636,7 @@ static int wilc_mac_open(struct net_device *ndev)
        for (i = 0; i < wl->vif_num; i++) {
                if (ndev == wl->vif[i]->ndev) {
                        wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif),
-                                                vif->iftype, vif->ifc_id);
+                                                vif->iftype, vif->idx);
                        wilc_set_operation_mode(vif, vif->iftype);
                        break;
                }
@@ -995,7 +995,6 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
        ndev->needs_free_netdev = true;
        vif->iftype = vif_type;
        vif->wilc->vif[wl->vif_num] = vif;
-       vif->ifc_id = wl->vif_num;
        vif->idx = wl->vif_num;
        wl->vif_num += 1;
        vif->mac_opened = 0;

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 012e3252caccbca86acd8dc212e082dc1e9edb63..1580909604f2f5f89eb9f96aa724cfa2df6c4968 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1462,7 +1462,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
 
                if (wl->initialized) {
                        wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif),
-                                                0, vif->ifc_id);
+                                                0, vif->idx);
                        wilc_set_operation_mode(vif, WILC_AP_MODE);
                        wilc_set_power_mgmt(vif, 0, 0);
                }
@@ -1693,11 +1693,10 @@ static int del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
                        wl->vif[i] = NULL;
                } else {
                        vif = wl->vif[i + 1];
-                       vif->ifc_id = i;
                        vif->idx = i;
                        wl->vif[i] = vif;
                        wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif),
-                                                vif->iftype, vif->ifc_id);
+                                                vif->iftype, vif->idx);
                }
        }
        wl->vif_num--;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index fca3380816c03d7e52feb0da2419795eb9ad989b..d5d830d738e63fc268718437a599990f6c471109 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 host_if_drv *hif_drv;
        struct net_device *ndev;
        u8 mode;
-       u8 ifc_id;
        struct timer_list during_ip_timer;
        bool obtaining_ip;
        struct timer_list periodic_rssi;