staging: r8188eu: remove _cancel_timer wrapper

Browse source

Remove the _cancel_timer wrapper function and call del_timer_sync
directly.

None of the callers needs the bcancelled variable that's populated by
_cancel_timer, these variables can be removed in the calling functions.

rtw_surveydone_event_callback calls _cancel_timer only if it believes
that the timer is currently running. We can drop this. It's safe to
call del_timer_sync when the timer is not running. The timer in question,
scan_to_timer, is used only for the site survey command (the rtw_survey
functions) so we won't be stopping it while it's in use by someone else.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220115165536.231210-7-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Martin Kaiser 2022-01-15 17:55:31 +01:00 • committed by Greg Kroah-Hartman

parent 9224cda4af

commit 2bd4aa6acb

4 changed files with 6 additions and 21 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/staging/r8188eu/core/rtw_cmd.c

View file

14

drivers/staging/r8188eu/core/rtw_mlme.c

View file

4

drivers/staging/r8188eu/core/rtw_p2p.c

View file

6

drivers/staging/r8188eu/include/osdep_service.h

View file