wcn36xx: Correct remove bss key response encoding

The WCN36XX_HAL_RMV_BSSKEY_RSP carries a single u32 with "status", so we
can use the standard status check function for decoding the result.

This was the last user of the v2 status checker, so remove the struct
and helper function.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index ae015a961110b813f585e39880306fc97d6c2617..61754967e2effc5429515ffc35ca25ba4f5cde01 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -312,23 +312,6 @@ static int wcn36xx_smd_rsp_status_check(void *buf, size_t len)
        return 0;
 }
 
-static int wcn36xx_smd_rsp_status_check_v2(struct wcn36xx *wcn, void *buf,
-                                            size_t len)
-{
-       struct wcn36xx_fw_msg_status_rsp_v2 *rsp;
-
-       if (wcn->chip_version != WCN36XX_CHIP_3620 ||
-           len < sizeof(struct wcn36xx_hal_msg_header) + sizeof(*rsp))
-               return wcn36xx_smd_rsp_status_check(buf, len);
-
-       rsp = buf + sizeof(struct wcn36xx_hal_msg_header);
-
-       if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status)
-               return rsp->status;
-
-       return 0;
-}
-
 int wcn36xx_smd_load_nv(struct wcn36xx *wcn)
 {
        struct nv_data *nv_d;
@@ -1649,8 +1632,7 @@ int wcn36xx_smd_remove_bsskey(struct wcn36xx *wcn,
                wcn36xx_err("Sending hal_remove_bsskey failed\n");
                goto out;
        }
-       ret = wcn36xx_smd_rsp_status_check_v2(wcn, wcn->hal_buf,
-                                             wcn->hal_rsp_len);
+       ret = wcn36xx_smd_rsp_status_check(wcn->hal_buf, wcn->hal_rsp_len);
        if (ret) {
                wcn36xx_err("hal_remove_bsskey response failed err=%d\n", ret);
                goto out;

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index c1b76d75cf859fd48bca764c3bdcca93cd3848e8..d74d781f4c8dcecb46475c31fac64935684bd37e 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -44,15 +44,6 @@ struct wcn36xx_fw_msg_status_rsp {
        u32     status;
 } __packed;
 
-/* wcn3620 returns this for tigger_ba */
-
-struct wcn36xx_fw_msg_status_rsp_v2 {
-       u8      bss_id[6];
-       u32     status __packed;
-       u16     count_following_candidates __packed;
-       /* candidate list follows */
-};
-
 struct wcn36xx_hal_ind_msg {
        struct list_head list;
        u8 *msg;