| Message ID | 20171102143223.825122-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | staging: rtlwifi: remove an unused variable | expand |
On Thu, Nov 2, 2017 at 7:31 AM, Arnd Bergmann <arnd@arndb.de> wrote: > 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()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/staging/rtlwifi/base.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c > index 2c693c7aa9d5..c947def37d31 100644 > --- a/drivers/staging/rtlwifi/base.c > +++ b/drivers/staging/rtlwifi/base.c > @@ -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); > -- > 2.9.0 > Acked-by: Kees Cook <keescook@chromium.org> Thanks for catching this! (sfr reported this too.) -Kees -- Kees Cook Pixel Security
diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c index 2c693c7aa9d5..c947def37d31 100644 --- a/drivers/staging/rtlwifi/base.c +++ b/drivers/staging/rtlwifi/base.c @@ -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);
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()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/staging/rtlwifi/base.c | 1 - 1 file changed, 1 deletion(-) -- 2.9.0