Skip to contentSkip to conversation

staging: rtlwifi: remove an unused variable

PATCH In review Arnd Bergmann 2 participants 2 messages Nov 2, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtlwifi: remove an unused variable

The timer conversion patch left a variable behind, and this escaped the build testing:

drivers/staging/rtlwifi/base.c: In function 'rtl_watch_dog_timer_callback':
drivers/staging/rtlwifi/base.c:2167:23: error: unused variable 'hw' [-Werror=unused-variable]

This removes the stale variable as well.

Fixes f8af6a323368 ("staging: rtlwifi: Convert timers to use timer_setup()")
---
 drivers/staging/rtlwifi/base.c | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/rtlwifi/base.c +0 -1
index 2c693c7aa9d5..c947def37d31 100644
@@ -2164,7 +2164,6 @@ void rtl_watchdog_wq_callback(void *data)
 void rtl_watch_dog_timer_callback(struct timer_list *t)
 {
 	struct rtl_priv *rtlpriv = from_timer(rtlpriv, t, works.watchdog_timer);
-	struct ieee80211_hw *hw = rtlpriv->hw;
 
 	queue_delayed_work(rtlpriv->works.rtl_wq,
 			   &rtlpriv->works.watchdog_wq, 0);
Signature · 1 line
2.9.0
Acked-by on v1 1/1
#1 lore raw
Quoted 27 lines · Arnd Bergmann

The timer conversion patch left a variable behind, and this escaped the build testing:

drivers/staging/rtlwifi/base.c: In function 'rtl_watch_dog_timer_callback':
drivers/staging/rtlwifi/base.c:2167:23: error: unused variable 'hw' [-Werror=unused-variable]

This removes the stale variable as well.

Fixes f8af6a323368 ("staging: rtlwifi: Convert timers to use timer_setup()")
---
 drivers/staging/rtlwifi/base.c | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/rtlwifi/base.c +0 -2
index 2c693c7aa9d5..c947def37d31 100644
@@ -2164,7 +2164,6 @@ void rtl_watchdog_wq_callback(void *data)
 void rtl_watch_dog_timer_callback(struct timer_list *t)
 {
        struct rtl_priv *rtlpriv = from_timer(rtlpriv, t, works.watchdog_timer);
-       struct ieee80211_hw *hw = rtlpriv->hw;
 
        queue_delayed_work(rtlpriv->works.rtl_wq,
                           &rtlpriv->works.watchdog_wq, 0);
--
Quoted 2 lines

2.9.0

Thanks for catching this! (sfr reported this too.)

-Kees

Signature · 2 lines
Kees Cook
Pixel Security