Re: [PATCH 23/29] ath6kl: wmi: Remove unused variable 'rate'

[Kalle Valo]

Lee Jones  wrote:

> Fixes the following W=1 kernel build warning(s):
> 
>  drivers/net/wireless/ath/ath6kl/wmi.c: In function 
> ‘ath6kl_wmi_bitrate_reply_rx’:
>  drivers/net/wireless/ath/ath6kl/wmi.c:1204:6: warning: variable ‘rate’ set 
> but not used [-Wunused-but-set-variable]
> 
> Cc: Kalle Valo 
> Cc: "David S. Miller" 
> Cc: Jakub Kicinski 
> Cc: linux-wirel...@vger.kernel.org
> Cc: net...@vger.kernel.org
> Signed-off-by: Lee Jones 

Already fixed in ath.git.

error: patch failed: drivers/net/wireless/ath/ath6kl/wmi.c:1201
error: drivers/net/wireless/ath/ath6kl/wmi.c: patch does not apply
stg import: Diff does not apply cleanly

Patch set to Rejected.

-- 
https://patchwork.kernel.org/patch/11766815/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH 23/29] ath6kl: wmi: Remove unused variable 'rate'

[Lee Jones]

Fixes the following W=1 kernel build warning(s):

 drivers/net/wireless/ath/ath6kl/wmi.c: In function 
‘ath6kl_wmi_bitrate_reply_rx’:
 drivers/net/wireless/ath/ath6kl/wmi.c:1204:6: warning: variable ‘rate’ set but 
not used [-Wunused-but-set-variable]

Cc: Kalle Valo 
Cc: "David S. Miller" 
Cc: Jakub Kicinski 
Cc: linux-wirel...@vger.kernel.org
Cc: net...@vger.kernel.org
Signed-off-by: Lee Jones 
---
 drivers/net/wireless/ath/ath6kl/wmi.c | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c 
b/drivers/net/wireless/ath/ath6kl/wmi.c
index 6885d2ded53a8..a4339cca661f0 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1201,8 +1201,7 @@ static int ath6kl_wmi_pstream_timeout_event_rx(struct wmi 
*wmi, u8 *datap,
 static int ath6kl_wmi_bitrate_reply_rx(struct wmi *wmi, u8 *datap, int len)
 {
struct wmi_bit_rate_reply *reply;
-   s32 rate;
-   u32 sgi, index;
+   u32 index;
 
if (len < sizeof(struct wmi_bit_rate_reply))
return -EINVAL;
@@ -1211,15 +1210,10 @@ static int ath6kl_wmi_bitrate_reply_rx(struct wmi *wmi, 
u8 *datap, int len)
 
ath6kl_dbg(ATH6KL_DBG_WMI, "rateindex %d\n", reply->rate_index);
 
-   if (reply->rate_index == (s8) RATE_AUTO) {
-   rate = RATE_AUTO;
-   } else {
+   if (reply->rate_index != (s8) RATE_AUTO) {
index = reply->rate_index & 0x7f;
if (WARN_ON_ONCE(index > (RATE_MCS_7_40 + 1)))
return -EINVAL;
-
-   sgi = (reply->rate_index & 0x80) ? 1 : 0;
-   rate = wmi_rate_tbl[index][sgi];
}
 
ath6kl_wakeup_event(wmi->parent_dev);
-- 
2.25.1