timers: Get rid of del_singleshot_timer_sync()

del_singleshot_timer_sync() used to be an optimization for deleting timers
which are not rearmed from the timer callback function.

This optimization turned out to be broken and got mapped to
del_timer_sync() about 17 years ago.

Get rid of the undocumented indirection and use del_timer_sync() directly.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.706987932@linutronix.de

diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
index dc4c0a0a512903235d9c580789cf2c74453ad5c0..30b4c288c1bbc3ba4dfedd38abf9663ace12e819 100644 (file)
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -155,7 +155,7 @@ ssize_t tpm_common_read(struct file *file, char __user *buf,
 out:
        if (!priv->response_length) {
                *off = 0;
-               del_singleshot_timer_sync(&priv->user_read_timer);
+               del_timer_sync(&priv->user_read_timer);
                flush_work(&priv->timeout_work);
        }
        mutex_unlock(&priv->buffer_mutex);
@@ -262,7 +262,7 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait)
 void tpm_common_release(struct file *file, struct file_priv *priv)
 {
        flush_work(&priv->async_work);
-       del_singleshot_timer_sync(&priv->user_read_timer);
+       del_timer_sync(&priv->user_read_timer);
        flush_work(&priv->timeout_work);
        file->private_data = NULL;
        priv->response_length = 0;

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 02fdef7a16c872dab6fb3694550d7b3f5adab549..c7cd54171d99439a7f52803c0f74c56d3fcb73e0 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1116,8 +1116,8 @@ cleanup:
                if (ctlx == get_active_ctlx(hw)) {
                        spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
 
-                       del_singleshot_timer_sync(&hw->reqtimer);
-                       del_singleshot_timer_sync(&hw->resptimer);
+                       del_timer_sync(&hw->reqtimer);
+                       del_timer_sync(&hw->resptimer);
                        hw->req_timer_done = 1;
                        hw->resp_timer_done = 1;
                        usb_kill_urb(&hw->ctlx_urb);

diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index e13da7fadffff4153c42070c996147cb91080fc5..c13f1699e5a2ffa71b67bb14acaced81ea1738cc 100644 (file)
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -170,9 +170,9 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
                 */
                prism2sta_ifstate(wlandev, P80211ENUM_ifstate_disable);
 
-               del_singleshot_timer_sync(&hw->throttle);
-               del_singleshot_timer_sync(&hw->reqtimer);
-               del_singleshot_timer_sync(&hw->resptimer);
+               del_timer_sync(&hw->throttle);
+               del_timer_sync(&hw->reqtimer);
+               del_timer_sync(&hw->resptimer);
 
                /* Unlink all the URBs. This "removes the wheels"
                 * from the entire CTLX handling mechanism.

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 648f00105f588dac3e713aab419c21ac8e056e99..ea35d00123f07e4afa7f0c772b685e985bcaf159 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -190,8 +190,6 @@ extern int try_to_del_timer_sync(struct timer_list *timer);
 # define del_timer_sync(t)             del_timer(t)
 #endif
 
-#define del_singleshot_timer_sync(t) del_timer_sync(t)
-
 extern void init_timers(void);
 struct hrtimer;
 extern enum hrtimer_restart it_real_fn(struct hrtimer *);

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index f40c88c156fe864fb741afe4959736e23ab9eb3b..190e06980d876783ad32a1ae430e683983c3c58a 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1933,7 +1933,7 @@ signed long __sched schedule_timeout(signed long timeout)
        timer_setup_on_stack(&timer.timer, process_timeout, 0);
        __mod_timer(&timer.timer, expire, MOD_TIMER_NOTPENDING);
        schedule();
-       del_singleshot_timer_sync(&timer.timer);
+       del_timer_sync(&timer.timer);
 
        /* Remove the timer from the object tracker */
        destroy_timer_on_stack(&timer.timer);

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 656cec2083718580f9060e9a370e88b95e5c4b4d..ab453ede54f0cd7be590495952a3feb71d92aef1 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1164,7 +1164,7 @@ xprt_request_enqueue_receive(struct rpc_task *task)
        spin_unlock(&xprt->queue_lock);
 
        /* Turn off autodisconnect */
-       del_singleshot_timer_sync(&xprt->timer);
+       del_timer_sync(&xprt->timer);
        return 0;
 }