The following commit has been merged in the master branch: commit c138f67ad4721801791a01cd10c816414b33b48d Author: Christophe JAILLET christophe.jaillet@wanadoo.fr Date: Mon Jan 10 22:32:27 2022 +0100

batman-adv: Remove redundant 'flush_workqueue()' calls

'destroy_workqueue()' already drains the queue before destroying it, so there is no need to flush it explicitly.

Remove the redundant 'flush_workqueue()' calls.

This was generated with coccinelle:

@@ expression E; @@ - flush_workqueue(E); destroy_workqueue(E);

Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 5207cd8d6ad8..8f1b724d0412 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -132,7 +132,6 @@ static void __exit batadv_exit(void) rtnl_link_unregister(&batadv_link_ops); unregister_netdevice_notifier(&batadv_hard_if_notifier);

- flush_workqueue(batadv_event_workqueue); destroy_workqueue(batadv_event_workqueue); batadv_event_workqueue = NULL;