tree 2afdf56985b3b068734020c69ff78125e1e0e6c3
parent ec0ad95612c8483215b1f6d2a99cfcff9267de2d
author Greg Kroah-Hartman <gregkh@google.com> 1713281452 +0000
committer Greg Kroah-Hartman <gregkh@google.com> 1713281576 +0000

Revert "timers: Rename del_timer_sync() to timer_delete_sync()"

This reverts commit 48a8a53939604aaab44c0699851f201f80db877d which is
commit 9b13df3fb64ee95e2397585404e442afee2c7d4f upstream.

It breaks the Android kernel abi by turning del_timer_sync() into an
inline function, which breaks the abi.  Fix this by putting it back as
needed AND fix up the only use of this new function in
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c which is
what caused this commit to be backported to 4.19.y in the first place.

Bug: 161946584
Change-Id: Icd26c7c81e6172f36eeeb69827989bfab1d32afe
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>