]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: wilc1000: Remove unused mutex cfg_values_lock
authorAdham Abozaeid <adham.abozaeid@microchip.com>
Fri, 9 Nov 2018 18:20:17 +0000 (18:20 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 11 Nov 2018 19:38:54 +0000 (11:38 -0800)
After removing cfg_values member, cfg_values_lock that was used to protect
it can also be removed.

Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c
drivers/staging/wilc1000/host_interface.h

index 8d1142776310d1e30a582569c415ebd3cd00ee55..2bf91df1ded1131f35f43419475753b4697909fd 100644 (file)
@@ -369,11 +369,8 @@ static void handle_cfg_param(struct work_struct *work)
        struct cfg_param_attr *param = &msg->body.cfg_info;
        int ret;
        struct wid wid_list[32];
-       struct host_if_drv *hif_drv = vif->hif_drv;
        int i = 0;
 
-       mutex_lock(&hif_drv->cfg_values_lock);
-
        if (param->flag & RETRY_SHORT) {
                wid_list[i].id = WID_SHORT_RETRY_LIMIT;
                wid_list[i].val = (s8 *)&param->short_retry_limit;
@@ -409,7 +406,6 @@ static void handle_cfg_param(struct work_struct *work)
        if (ret)
                netdev_err(vif->ndev, "Error in setting CFG params\n");
 
-       mutex_unlock(&hif_drv->cfg_values_lock);
        kfree(msg);
 }
 
@@ -3240,15 +3236,10 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
        timer_setup(&hif_drv->connect_timer, timer_connect_cb, 0);
        timer_setup(&hif_drv->remain_on_ch_timer, listen_timer_cb, 0);
 
-       mutex_init(&hif_drv->cfg_values_lock);
-       mutex_lock(&hif_drv->cfg_values_lock);
-
        hif_drv->hif_state = HOST_IF_IDLE;
 
        hif_drv->p2p_timeout = 0;
 
-       mutex_unlock(&hif_drv->cfg_values_lock);
-
        wilc->clients_count++;
 
        return 0;
index 1e2e50e91f76d8428a46fb34f4f537271fb4f783..523b46bfb48854ad8ca2d949503cf5813dc3ac3f 100644 (file)
@@ -293,8 +293,6 @@ struct host_if_drv {
        enum host_if_state hif_state;
 
        u8 assoc_bssid[ETH_ALEN];
-       /*lock to protect concurrent setting of cfg params*/
-       struct mutex cfg_values_lock;
 
        struct timer_list scan_timer;
        struct wilc_vif *scan_timer_vif;